diff --git a/translations/ring_client_windows.ts b/translations/ring_client_windows.ts
index a31b1c0ea725cab4222d1a1cad2d30dc5c3ac3b6..ed4ead3b4c14740d7ebed85c45956decd22e650a 100644
--- a/translations/ring_client_windows.ts
+++ b/translations/ring_client_windows.ts
@@ -15,43 +15,38 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="498"/>
-        <source>X</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.ui" line="568"/>
+        <location filename="../aboutdialog.ui" line="554"/>
         <source>Release : Samuel de Champlain</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="35"/>
+        <location filename="../aboutdialog.cpp" line="32"/>
         <source>Windows Ring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="36"/>
+        <location filename="../aboutdialog.cpp" line="33"/>
         <source>version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="43"/>
+        <location filename="../aboutdialog.cpp" line="40"/>
         <source>Created by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="49"/>
         <source>Artwork by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="53"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"></translation>
     </message>
@@ -74,84 +69,79 @@ Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="101"/>
+        <location filename="../accountdetails.ui" line="121"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="108"/>
+        <location filename="../accountdetails.ui" line="101"/>
         <source>Alias</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="128"/>
-        <source>Hash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="188"/>
+        <location filename="../accountdetails.ui" line="165"/>
         <source>Parameters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="200"/>
+        <location filename="../accountdetails.ui" line="183"/>
         <source>Hostname</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="281"/>
+        <location filename="../accountdetails.ui" line="238"/>
         <source>Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="307"/>
+        <location filename="../accountdetails.ui" line="264"/>
         <source>Voicemail number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="327"/>
+        <location filename="../accountdetails.ui" line="284"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="337"/>
+        <location filename="../accountdetails.ui" line="294"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="344"/>
+        <location filename="../accountdetails.ui" line="301"/>
         <source>DTMF tone type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="353"/>
+        <location filename="../accountdetails.ui" line="310"/>
         <source>RTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="363"/>
+        <location filename="../accountdetails.ui" line="320"/>
         <source>SIP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="391"/>
+        <location filename="../accountdetails.ui" line="398"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="398"/>
+        <location filename="../accountdetails.ui" line="412"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"></translation>
     </message>
@@ -161,258 +151,235 @@ Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="418"/>
+        <location filename="../accountdetails.ui" line="388"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="459"/>
+        <location filename="../accountdetails.ui" line="448"/>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="545"/>
+        <location filename="../accountdetails.ui" line="534"/>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="561"/>
+        <location filename="../accountdetails.ui" line="540"/>
         <source>Enable Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="632"/>
+        <location filename="../accountdetails.ui" line="621"/>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="659"/>
+        <location filename="../accountdetails.ui" line="648"/>
         <source>Registration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="671"/>
+        <location filename="../accountdetails.ui" line="660"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="688"/>
         <source>Network Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="708"/>
+        <location filename="../accountdetails.ui" line="697"/>
         <source>Local Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="756"/>
+        <location filename="../accountdetails.ui" line="745"/>
         <source>Published Adress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="771"/>
+        <location filename="../accountdetails.ui" line="760"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="784"/>
+        <location filename="../accountdetails.ui" line="773"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="802"/>
+        <location filename="../accountdetails.ui" line="791"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="825"/>
+        <location filename="../accountdetails.ui" line="814"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="871"/>
+        <location filename="../accountdetails.ui" line="860"/>
         <source>Use STUN</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="904"/>
+        <location filename="../accountdetails.ui" line="893"/>
         <source>Use TURN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="971"/>
+        <location filename="../accountdetails.ui" line="960"/>
         <source>Realm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="994"/>
+        <location filename="../accountdetails.ui" line="983"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1023"/>
+        <location filename="../accountdetails.ui" line="1012"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1108"/>
+        <location filename="../accountdetails.ui" line="1097"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1198"/>
+        <location filename="../accountdetails.ui" line="1187"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1225"/>
+        <location filename="../accountdetails.ui" line="1214"/>
         <source>Media Stream Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1232"/>
+        <location filename="../accountdetails.ui" line="1221"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1241"/>
+        <location filename="../accountdetails.ui" line="1230"/>
         <source>Key exchange protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1263"/>
+        <location filename="../accountdetails.ui" line="1252"/>
         <source>Fallback on RTP on encryption failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1276"/>
+        <location filename="../accountdetails.ui" line="1265"/>
         <source>Negotiation Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1283"/>
+        <location filename="../accountdetails.ui" line="1272"/>
         <source>Encrypt negotiation (TLS)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1292"/>
+        <location filename="../accountdetails.ui" line="1281"/>
         <source>CA certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1302"/>
+        <location filename="../accountdetails.ui" line="1291"/>
         <source>User certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1312"/>
+        <location filename="../accountdetails.ui" line="1301"/>
         <source>Private key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1322"/>
+        <location filename="../accountdetails.ui" line="1311"/>
         <source>Private key password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1332"/>
+        <location filename="../accountdetails.ui" line="1321"/>
         <source>TLS protocol method</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1342"/>
+        <location filename="../accountdetails.ui" line="1331"/>
         <source>Outgoing TLS server name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1352"/>
+        <location filename="../accountdetails.ui" line="1341"/>
         <source>Negotiation timeout (seconds)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1470"/>
+        <location filename="../accountdetails.ui" line="1459"/>
         <source>Verify incoming certificates (server side)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1480"/>
+        <location filename="../accountdetails.ui" line="1469"/>
         <source>Verify answer certificates (client side)</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1508"/>
+        <location filename="../accountdetails.ui" line="1497"/>
         <source>Cipher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1508"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1529"/>
+        <location filename="../accountdetails.ui" line="1518"/>
         <source>User custom cipher list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
-        <source>Enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
-        <source>Bitrate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <source>Samplerate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="326"/>
+        <location filename="../accountdetails.cpp" line="180"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="328"/>
+        <location filename="../accountdetails.cpp" line="182"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -420,89 +387,68 @@ Ring is a secured and distributed communication software.</source>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="100"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="134"/>
-        <source>Call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="148"/>
-        <source>Accept</source>
+        <location filename="../callwidget.ui" line="20"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="159"/>
-        <source>Refuse</source>
+        <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="244"/>
-        <source>State:</source>
+        <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="251"/>
-        <source>OK</source>
+        <location filename="../callwidget.ui" line="258"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="329"/>
-        <source>History</source>
+        <location filename="../callwidget.ui" line="292"/>
+        <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="355"/>
-        <source>Search</source>
+        <location filename="../callwidget.ui" line="306"/>
+        <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="365"/>
-        <source>Sort:</source>
+        <location filename="../callwidget.ui" line="317"/>
+        <source>Refuse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="413"/>
-        <source>Contact</source>
+        <location filename="../callwidget.ui" line="440"/>
+        <source>Search / Enter number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="123"/>
+        <location filename="../callwidget.cpp" line="133"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="129"/>
+        <location filename="../callwidget.cpp" line="139"/>
         <source>Add to contact</source>
         <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../callwidget.cpp" line="319"/>
-        <source>Call State: %1</source>
-        <comment>%1 is the state of the call</comment>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ConfigurationWidget</name>
@@ -517,53 +463,58 @@ Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="48"/>
+        <location filename="../configurationwidget.ui" line="51"/>
         <source>History Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="57"/>
+        <location filename="../configurationwidget.ui" line="60"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="76"/>
+        <location filename="../configurationwidget.ui" line="79"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="101"/>
+        <location filename="../configurationwidget.ui" line="104"/>
         <source>Clear History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
+        <location filename="../configurationwidget.ui" line="119"/>
         <source>Ringtones Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="166"/>
-        <source>Video</source>
+        <location filename="../configurationwidget.ui" line="158"/>
+        <source>Misc. Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="208"/>
-        <source>Device Selection</source>
+        <location filename="../configurationwidget.ui" line="165"/>
+        <source>Keep minimized on close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="248"/>
-        <source>Device</source>
+        <location filename="../configurationwidget.ui" line="189"/>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="231"/>
+        <source>Device Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="271"/>
-        <source>Resolution</source>
+        <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="294"/>
-        <source>Framerate</source>
+        <source>Resolution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -582,12 +533,12 @@ Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="171"/>
+        <location filename="../configurationwidget.cpp" line="177"/>
         <source>New Account</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
@@ -595,7 +546,7 @@ Ring is a secured and distributed communication software.</source>
 <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 type="unfinished"></translation>
     </message>
@@ -646,94 +597,104 @@ Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="42"/>
+        <location filename="../instantmessagingwidget.cpp" line="45"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="47"/>
+        <location filename="../instantmessagingwidget.cpp" line="50"/>
         <source>Display date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="50"/>
+        <location filename="../instantmessagingwidget.cpp" line="53"/>
         <source>Display author</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MainBar</name>
-    <message>
-        <location filename="../mainbar.ui" line="477"/>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>MainWindow</name>
     <message>
-        <location filename="../mainbar.ui" line="539"/>
-        <source>Dial Number</source>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Ring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainbar.cpp" line="32"/>
+        <location filename="../mainwindow.cpp" line="77"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NavBar</name>
     <message>
-        <location filename="../mainbar.cpp" line="36"/>
-        <source>Exit</source>
+        <location filename="../navbar.ui" line="54"/>
+        <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>TransferDialog</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
+        <location filename="../transferdialog.ui" line="14"/>
+        <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NavBar</name>
     <message>
-        <location filename="../navbar.ui" line="54"/>
-        <source>Done</source>
+        <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="39"/>
+        <location filename="../videooverlay.ui" line="167"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="153"/>
+        <location filename="../videooverlay.ui" line="150"/>
         <source>00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="160"/>
+        <location filename="../videooverlay.ui" line="29"/>
         <source>Hangup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="167"/>
+        <location filename="../videooverlay.ui" line="36"/>
         <source>...</source>
         <translation type="unfinished"></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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.cpp" line="43"/>
+        <location filename="../videooverlay.cpp" line="45"/>
         <source>Mute Video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -741,17 +702,17 @@ Ring is a secured and distributed communication software.</source>
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="184"/>
+        <location filename="../videoview.cpp" line="181"/>
         <source>Share entire screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="189"/>
+        <location filename="../videoview.cpp" line="186"/>
         <source>Share screen area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="195"/>
+        <location filename="../videoview.cpp" line="192"/>
         <source>Share file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -759,18 +720,18 @@ Ring is a secured and distributed communication software.</source>
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.ui" line="429"/>
-        <source>Wizard</source>
+        <location filename="../wizarddialog.cpp" line="52"/>
+        <source>Please wait while we create your account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="458"/>
-        <source>Greetings ! Please enter a username</source>
+        <location filename="../wizarddialog.ui" line="937"/>
+        <source>Join the Ring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="61"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.ui" line="1000"/>
+        <source>Choose your username:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/translations/ring_client_windows_ar.ts b/translations/ring_client_windows_ar.ts
index 6365c96be55d9af4de949e18357eb9cf3a5aa0bd..832f7e86b218a08b94b9edbbb159d6c18e467d56 100644
--- a/translations/ring_client_windows_ar.ts
+++ b/translations/ring_client_windows_ar.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ar" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ar">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,44 +15,43 @@
         <translation>الأطراف المصممة</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>الإصدار: 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>وسيط Microsoft Windows إلى Ring
 Ring برمجية تواصل مؤمنة و موزعة.</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>الإصدار</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="43"/>
+        <location filename="../aboutdialog.cpp" line="40"/>
         <source>Created by:</source>
         <translation>أحدثه:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="49"/>
         <source>Artwork by:</source>
         <translation>مصمم العمل الفني:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="53"/>
         <source>Based on the SFLPhone project</source>
         <translation>يستند على مشروع SFLPhone</translation>
     </message>
@@ -73,84 +74,83 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
         <translation>حساب</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="101"/>
+        <location filename="../accountdetails.ui" line="121"/>
         <source>Type</source>
         <translation>النوع</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="108"/>
+        <location filename="../accountdetails.ui" line="101"/>
         <source>Alias</source>
         <translation>الاسم المستعار</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="128"/>
         <source>Hash</source>
-        <translation>مزيج (hash)</translation>
+        <translation type="vanished">مزيج (hash)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="188"/>
+        <location filename="../accountdetails.ui" line="165"/>
         <source>Parameters</source>
         <translation>المعلمات</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="200"/>
+        <location filename="../accountdetails.ui" line="183"/>
         <source>Hostname</source>
         <translation>اسم المضيف</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>اسم المستخدم</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>كلمة السر</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="281"/>
+        <location filename="../accountdetails.ui" line="238"/>
         <source>Proxy</source>
         <translation>الوكيل</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="307"/>
+        <location filename="../accountdetails.ui" line="264"/>
         <source>Voicemail number</source>
         <translation>رقم البريد الصوتي</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="327"/>
+        <location filename="../accountdetails.ui" line="284"/>
         <source>Auto-answer calls</source>
         <translation>رد ألي على المكالمات</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="337"/>
+        <location filename="../accountdetails.ui" line="294"/>
         <source>UPnP enabled</source>
         <translation>تفعيل UPnP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="344"/>
+        <location filename="../accountdetails.ui" line="301"/>
         <source>DTMF tone type</source>
         <translation>نوع النغمة DTMF</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>إسمح لأشخاص  مجهولة بالإتصال</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="398"/>
+        <location filename="../accountdetails.ui" line="412"/>
         <source>Allow Call From Contact</source>
         <translation>إسمح للأشخاص في قائمة الإتصالات المعروفة بالإتصال</translation>
     </message>
@@ -160,258 +160,251 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
         <translation>إسمح  للأشخاص  في تاريخ  المكالمات  بالإتصال</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="418"/>
+        <location filename="../accountdetails.ui" line="388"/>
         <source>Ring Account Settings</source>
         <translation>إعدادات الحساب Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="459"/>
+        <location filename="../accountdetails.ui" line="448"/>
         <source>Audio</source>
         <translation>صوت</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="545"/>
+        <location filename="../accountdetails.ui" line="534"/>
         <source>Video</source>
         <translation>فيديو</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="561"/>
+        <location filename="../accountdetails.ui" line="540"/>
         <source>Enable Video</source>
         <translation>فعل الفيديو</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="632"/>
+        <location filename="../accountdetails.ui" line="621"/>
         <source>Advanced</source>
         <translation>إعدادات متقدمة</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="659"/>
+        <location filename="../accountdetails.ui" line="648"/>
         <source>Registration</source>
         <translation>التسجيل</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="671"/>
+        <location filename="../accountdetails.ui" line="660"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>إنقضاء فترة التسجيل (ثواني):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="688"/>
         <source>Network Interface</source>
         <translation>واجهة الشبكة</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="708"/>
+        <location filename="../accountdetails.ui" line="697"/>
         <source>Local Port:</source>
         <translation>نقطة عبور ( port ) محلية</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="756"/>
+        <location filename="../accountdetails.ui" line="745"/>
         <source>Published Adress</source>
         <translation>العنوان المنشور</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="771"/>
+        <location filename="../accountdetails.ui" line="760"/>
         <source>Same as local parameters</source>
         <translation>مثل المعلمات المحلية</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="784"/>
+        <location filename="../accountdetails.ui" line="773"/>
         <source>Set published address and port:</source>
         <translation>وضع العنوان و نقطة العبور المنشورة</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="802"/>
+        <location filename="../accountdetails.ui" line="791"/>
         <source>Address</source>
         <translation>العنوان</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</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>عنوان خادم التطبيق</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="904"/>
+        <location filename="../accountdetails.ui" line="893"/>
         <source>Use TURN</source>
         <translation>إستعمل TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="971"/>
+        <location filename="../accountdetails.ui" line="960"/>
         <source>Realm</source>
         <translation>حقل ( realm )</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="994"/>
+        <location filename="../accountdetails.ui" line="983"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>جلسة تفاوض SDP (حل تعويض ICE)</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>هذه الإعدادات مستعملة فقط أثناء جلسات التفاوض SDP في حالة ما ICE ليس مؤيد من طرف خادم التطبيق أو الشخص المكالم.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1023"/>
+        <location filename="../accountdetails.ui" line="1012"/>
         <source>Audio RTP Port Range</source>
         <translation>نطاق المنفذ RTP الصوتي</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>الحد الأدنى</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>الحد الاقصى</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1108"/>
+        <location filename="../accountdetails.ui" line="1097"/>
         <source>Video RTP Port Range</source>
         <translation>نطاق المنفذ RTP فيديو</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1198"/>
+        <location filename="../accountdetails.ui" line="1187"/>
         <source>Security</source>
         <translation>تأمين</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1225"/>
+        <location filename="../accountdetails.ui" line="1214"/>
         <source>Media Stream Encryption</source>
         <translation>تشفير تيارات الميديا</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1232"/>
+        <location filename="../accountdetails.ui" line="1221"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>تشفير تيار الميديا (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1241"/>
+        <location filename="../accountdetails.ui" line="1230"/>
         <source>Key exchange protocol</source>
         <translation>بروتوكول تبادل المفاتيح</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1263"/>
+        <location filename="../accountdetails.ui" line="1252"/>
         <source>Fallback on RTP on encryption failure</source>
         <translation>إلجأ إلى RTP عند فشل التشفير</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1276"/>
+        <location filename="../accountdetails.ui" line="1265"/>
         <source>Negotiation Encryption</source>
         <translation>تشفير التفاوض</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1283"/>
+        <location filename="../accountdetails.ui" line="1272"/>
         <source>Encrypt negotiation (TLS)</source>
         <translation>تشفير التفاوض (TLS)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1292"/>
+        <location filename="../accountdetails.ui" line="1281"/>
         <source>CA certificate</source>
         <translation>شهادة CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1302"/>
+        <location filename="../accountdetails.ui" line="1291"/>
         <source>User certificate</source>
         <translation>شهادة المستخدم</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1312"/>
+        <location filename="../accountdetails.ui" line="1301"/>
         <source>Private key</source>
         <translation>المفتاح الخاص</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1322"/>
+        <location filename="../accountdetails.ui" line="1311"/>
         <source>Private key password</source>
         <translation>كلمة سر المفتاح الخاص</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1332"/>
+        <location filename="../accountdetails.ui" line="1321"/>
         <source>TLS protocol method</source>
         <translation>أسلوب بروتوكول TLS</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1342"/>
+        <location filename="../accountdetails.ui" line="1331"/>
         <source>Outgoing TLS server name</source>
         <translation>اسم خادم TLS الصادر</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1352"/>
+        <location filename="../accountdetails.ui" line="1341"/>
         <source>Negotiation timeout (seconds)</source>
         <translation>إنقضاء فترة التفاوض (ثواني)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1470"/>
+        <location filename="../accountdetails.ui" line="1459"/>
         <source>Verify incoming certificates (server side)</source>
         <translation>تحقق من الشهادات الواردة (من جانب الخادم)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1480"/>
+        <location filename="../accountdetails.ui" line="1469"/>
         <source>Verify answer certificates (client side)</source>
         <translation>تحقق من الشهادات الواردة (من جانب الزبون)</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>استلزم شهادة للإتصالات TLS الواردة</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1508"/>
+        <location filename="../accountdetails.ui" line="1497"/>
         <source>Cipher</source>
         <translation>شيفرة</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1508"/>
         <source>Use default ciphers</source>
         <translation>إستعمل قائمة الشيفرة المبدئية</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1529"/>
+        <location filename="../accountdetails.ui" line="1518"/>
         <source>User custom cipher list</source>
         <translation>إستعمل قائمة شيفرة  حسب الطلب</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Enabled</source>
-        <translation>عملي</translation>
+        <translation type="vanished">عملي</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Name</source>
-        <translation>الإسم</translation>
+        <translation type="vanished">الإسم</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Bitrate</source>
-        <translation>معدل البت</translation>
+        <translation type="vanished">معدل البت</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
         <source>Samplerate</source>
-        <translation>معدل العينة</translation>
+        <translation type="vanished">معدل العينة</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="326"/>
+        <location filename="../accountdetails.cpp" line="180"/>
         <source>Choose File</source>
         <translation>إختار وثيقة</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="328"/>
+        <location filename="../accountdetails.cpp" line="182"/>
         <source>Files (*)</source>
         <translation>وثائق (*)</translation>
     </message>
@@ -419,88 +412,101 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
 <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>ألغي</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="134"/>
+        <location filename="../callwidget.ui" line="292"/>
         <source>Call</source>
         <translation>مكالمة</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="148"/>
+        <location filename="../callwidget.ui" line="306"/>
         <source>Accept</source>
         <translation>قبول</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="159"/>
+        <location filename="../callwidget.ui" line="317"/>
         <source>Refuse</source>
         <translation>أرفض</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>حالة:</translation>
+        <translation type="vanished">حالة:</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="251"/>
         <source>OK</source>
-        <translation>موافق</translation>
+        <translation type="vanished">موافق</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="329"/>
         <source>History</source>
-        <translation>تاريخ</translation>
+        <translation type="vanished">تاريخ</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="355"/>
         <source>Search</source>
-        <translation>إبحث</translation>
+        <translation type="vanished">إبحث</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="365"/>
         <source>Sort:</source>
-        <translation>فرز</translation>
+        <translation type="vanished">فرز</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="413"/>
         <source>Contact</source>
-        <translation>إتصال</translation>
+        <translation type="vanished">إتصال</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="123"/>
+        <location filename="../callwidget.cpp" line="133"/>
         <source>Copy number</source>
         <translation>نسخ الرقم</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="129"/>
+        <location filename="../callwidget.cpp" line="139"/>
         <source>Add to contact</source>
         <translation>أضف إلى الاتصال</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>معرفك Ring ID هو 1% </translation>
+        <translation type="vanished">معرفك 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>لا يوجد حساب Ring</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>مكالمة من 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>حالة المكالمة: 1%</translation>
+        <translation type="vanished">حالة المكالمة: 1%</translation>
     </message>
 </context>
 <context>
@@ -516,54 +522,63 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
         <translation>عام</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="48"/>
+        <location filename="../configurationwidget.ui" line="51"/>
         <source>History Settings</source>
         <translation>إعدادات التاريخ</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="57"/>
+        <location filename="../configurationwidget.ui" line="60"/>
         <source>Keep History for (days)</source>
         <translation>أبقي على التاريخ ل (أيام)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="76"/>
+        <location filename="../configurationwidget.ui" line="79"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(ضع صفر لتاريخ غير محدود)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="101"/>
+        <location filename="../configurationwidget.ui" line="104"/>
         <source>Clear History</source>
         <translation>أزل التاريخ</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
+        <location filename="../configurationwidget.ui" line="119"/>
         <source>Ringtones Selection</source>
         <translation>إختيارات النغمات</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>فيديو</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="208"/>
+        <location filename="../configurationwidget.ui" line="231"/>
         <source>Device Selection</source>
         <translation>إختيارات الأجهزة</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="248"/>
+        <location filename="../configurationwidget.ui" line="271"/>
         <source>Device</source>
         <translation>جهاز</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="271"/>
+        <location filename="../configurationwidget.ui" line="294"/>
         <source>Resolution</source>
         <translation>دقة العرض (resolution)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="294"/>
         <source>Framerate</source>
-        <translation>معدل الاطار (framerate)</translation>
+        <translation type="vanished">معدل الاطار (framerate)</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="345"/>
@@ -581,12 +596,12 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
         <translation>إطلق Ring عند بدء التشغيل</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="171"/>
+        <location filename="../configurationwidget.cpp" line="177"/>
         <source>New Account</source>
         <translation>حساب جديد</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>هل أنت متأكد من حذف تاريخك  ؟</translation>
     </message>
@@ -594,7 +609,7 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
 <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;طرق إتصال متعددة&gt;</translation>
     </message>
@@ -645,17 +660,17 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
         <translation>أرسل</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="42"/>
+        <location filename="../instantmessagingwidget.cpp" line="45"/>
         <source>Copy</source>
         <translation>إنسخ</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="47"/>
+        <location filename="../instantmessagingwidget.cpp" line="50"/>
         <source>Display date</source>
         <translation>عرض التاريخ</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="50"/>
+        <location filename="../instantmessagingwidget.cpp" line="53"/>
         <source>Display author</source>
         <translation>عرض المؤلف</translation>
     </message>
@@ -663,24 +678,20 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
 <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>أطلب رقم</translation>
+        <translation type="vanished">أطلب رقم</translation>
     </message>
     <message>
-        <location filename="../mainbar.cpp" line="32"/>
         <source>About</source>
-        <translation>عن RING</translation>
+        <translation type="vanished">عن RING</translation>
     </message>
     <message>
-        <location filename="../mainbar.cpp" line="36"/>
         <source>Exit</source>
-        <translation>غادر</translation>
+        <translation type="vanished">غادر</translation>
     </message>
 </context>
 <context>
@@ -690,6 +701,11 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
         <source>Ring</source>
         <translation>Ring</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>About</source>
+        <translation type="unfinished">عن RING</translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
@@ -699,40 +715,68 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
         <translation>منجز</translation>
     </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>توقف</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="39"/>
+        <location filename="../videooverlay.ui" line="167"/>
         <source>Chat</source>
         <translation>دردشة</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>أنهي المحادثة</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>أبكم الصوت</translation>
     </message>
     <message>
-        <location filename="../videooverlay.cpp" line="43"/>
+        <location filename="../videooverlay.cpp" line="45"/>
         <source>Mute Video</source>
         <translation>أبكم الفيديو</translation>
     </message>
@@ -740,17 +784,17 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="184"/>
+        <location filename="../videoview.cpp" line="181"/>
         <source>Share entire screen</source>
         <translation>تقاسم كل الشاشة</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="189"/>
+        <location filename="../videoview.cpp" line="186"/>
         <source>Share screen area</source>
         <translation>تقاسم منطقة من الشاشة</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="195"/>
+        <location filename="../videoview.cpp" line="192"/>
         <source>Share file</source>
         <translation>تقاسم الوثيقة</translation>
     </message>
@@ -758,19 +802,27 @@ Ring برمجية تواصل مؤمنة و موزعة.</translation>
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.ui" line="429"/>
         <source>Wizard</source>
-        <translation>معين</translation>
+        <translation type="vanished">معين</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="458"/>
         <source>Greetings ! Please enter a username</source>
-        <translation>مرحبا ! الرجاء إدخال إسم مستخدم</translation>
+        <translation type="vanished">مرحبا ! الرجاء إدخال إسم مستخدم</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>الرجاء الإنتظار في حين نحدث حسابك</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>
diff --git a/translations/ring_client_windows_de.ts b/translations/ring_client_windows_de.ts
index 31e9fbb46a1548157b224d0ac4bd79dde39e7dca..25920922ba794fd4bc43937f31ecf750b3161b51 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 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
         <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 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
         <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 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
 <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 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
         <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 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
         <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 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
 <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 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
         <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 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
 <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 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
         <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>
@@ -699,40 +715,68 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
         <translation>Erledigt</translation>
     </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 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
 <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 @@ Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
 <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>
diff --git a/translations/ring_client_windows_fr.ts b/translations/ring_client_windows_fr.ts
index 71b9c793cdd530f8a8ab2f76f69af120f9f20aab..1b6cc7e907816b0ca9dbbcb658f5d353493262bd 100644
--- a/translations/ring_client_windows_fr.ts
+++ b/translations/ring_client_windows_fr.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fr">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,44 +15,43 @@
         <translation>Crédits</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>Version : 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>Le client Windows de Ring
 Ring est un logiciel de communication sécurisé et distribué.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="35"/>
+        <location filename="../aboutdialog.cpp" line="32"/>
         <source>Windows Ring</source>
         <translation>Ring Windows</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>Créer par :</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="49"/>
         <source>Artwork by:</source>
         <translation>Graphismes par :</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="53"/>
         <source>Based on the SFLPhone project</source>
         <translation>Basé sur le projet SFLphone</translation>
     </message>
@@ -73,84 +74,83 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="101"/>
+        <location filename="../accountdetails.ui" line="121"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="108"/>
+        <location filename="../accountdetails.ui" line="101"/>
         <source>Alias</source>
         <translation>Nom d&apos;emprunt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="128"/>
         <source>Hash</source>
-        <translation>Hash</translation>
+        <translation type="vanished">Hash</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="188"/>
+        <location filename="../accountdetails.ui" line="165"/>
         <source>Parameters</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="200"/>
+        <location filename="../accountdetails.ui" line="183"/>
         <source>Hostname</source>
         <translation>Nom de machine</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>Nom d&apos;utilisateur</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>Mot-de-passe</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="281"/>
+        <location filename="../accountdetails.ui" line="238"/>
         <source>Proxy</source>
         <translation>Serveur mandataire</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="307"/>
+        <location filename="../accountdetails.ui" line="264"/>
         <source>Voicemail number</source>
         <translation>Numéro de boîte vocale</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="327"/>
+        <location filename="../accountdetails.ui" line="284"/>
         <source>Auto-answer calls</source>
         <translation>Répondre automatiquement</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="337"/>
+        <location filename="../accountdetails.ui" line="294"/>
         <source>UPnP enabled</source>
         <translation>UPnP activé</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="344"/>
+        <location filename="../accountdetails.ui" line="301"/>
         <source>DTMF tone type</source>
         <translation>Type de tonalité DTMF</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>Autoriser les appels de personnes inconnues</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="398"/>
+        <location filename="../accountdetails.ui" line="412"/>
         <source>Allow Call From Contact</source>
         <translation>Autoriser la réception d&apos;appels des interlocuteurs appartenant à votre liste de contacts</translation>
     </message>
@@ -160,258 +160,251 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
         <translation>Autoriser les appels enregistrés dans l&apos;historique</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="418"/>
+        <location filename="../accountdetails.ui" line="388"/>
         <source>Ring Account Settings</source>
         <translation>Paramètres Compte Ring</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>Vidéo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="561"/>
+        <location filename="../accountdetails.ui" line="540"/>
         <source>Enable Video</source>
         <translation>Activer la vidéo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="632"/>
+        <location filename="../accountdetails.ui" line="621"/>
         <source>Advanced</source>
         <translation>Options avancées</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="659"/>
+        <location filename="../accountdetails.ui" line="648"/>
         <source>Registration</source>
         <translation>Enregistrement</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="671"/>
+        <location filename="../accountdetails.ui" line="660"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Temps d&apos;expiration de l&apos;enregistrement (en secondes):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="688"/>
         <source>Network Interface</source>
         <translation>Interface réseau</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="708"/>
+        <location filename="../accountdetails.ui" line="697"/>
         <source>Local Port:</source>
         <translation>Port local :</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="756"/>
+        <location filename="../accountdetails.ui" line="745"/>
         <source>Published Adress</source>
         <translation>Adresse exposée</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="771"/>
+        <location filename="../accountdetails.ui" line="760"/>
         <source>Same as local parameters</source>
         <translation>Identique aux paramètres locaux</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="784"/>
+        <location filename="../accountdetails.ui" line="773"/>
         <source>Set published address and port:</source>
         <translation>Indiquer l&apos;adresse publiée et le port:</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>Utiliser STUN</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>URL du serveur</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="904"/>
+        <location filename="../accountdetails.ui" line="893"/>
         <source>Use TURN</source>
         <translation>Utiliser TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="971"/>
+        <location filename="../accountdetails.ui" line="960"/>
         <source>Realm</source>
         <translation>Domaine</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="994"/>
+        <location filename="../accountdetails.ui" line="983"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Négociation de session SDP (bascule sur ICE)</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>Ces paramètres sont uniquement utilisés durant la négociation de la session SDP au cas où ICE ne serait pas supporté par le serveur ou le correspondant.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1023"/>
+        <location filename="../accountdetails.ui" line="1012"/>
         <source>Audio RTP Port Range</source>
         <translation>Plage des ports RTP audio</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>Minimum</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>Maximum</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1108"/>
+        <location filename="../accountdetails.ui" line="1097"/>
         <source>Video RTP Port Range</source>
         <translation>Plage des ports RTP vidéo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1198"/>
+        <location filename="../accountdetails.ui" line="1187"/>
         <source>Security</source>
         <translation>Sécurité</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1225"/>
+        <location filename="../accountdetails.ui" line="1214"/>
         <source>Media Stream Encryption</source>
         <translation>Chiffrement du flux média</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1232"/>
+        <location filename="../accountdetails.ui" line="1221"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>Chiffrer les flux média (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1241"/>
+        <location filename="../accountdetails.ui" line="1230"/>
         <source>Key exchange protocol</source>
         <translation>Protocole d&apos;échange de clé</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1263"/>
+        <location filename="../accountdetails.ui" line="1252"/>
         <source>Fallback on RTP on encryption failure</source>
         <translation>Basculer en mode RTP si le chiffrement échoue</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1276"/>
+        <location filename="../accountdetails.ui" line="1265"/>
         <source>Negotiation Encryption</source>
         <translation>Négociation du chiffrement</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1283"/>
+        <location filename="../accountdetails.ui" line="1272"/>
         <source>Encrypt negotiation (TLS)</source>
         <translation>Chiffrer les négociations (TLS)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1292"/>
+        <location filename="../accountdetails.ui" line="1281"/>
         <source>CA certificate</source>
         <translation>Certificat CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1302"/>
+        <location filename="../accountdetails.ui" line="1291"/>
         <source>User certificate</source>
         <translation>Certificat utilisateur</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1312"/>
+        <location filename="../accountdetails.ui" line="1301"/>
         <source>Private key</source>
         <translation>Clé privée</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1322"/>
+        <location filename="../accountdetails.ui" line="1311"/>
         <source>Private key password</source>
         <translation>Mot-de-passe clé privée</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1332"/>
+        <location filename="../accountdetails.ui" line="1321"/>
         <source>TLS protocol method</source>
         <translation>Méthode du protocole TLS</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1342"/>
+        <location filename="../accountdetails.ui" line="1331"/>
         <source>Outgoing TLS server name</source>
         <translation>Adresse du serveur TLS sortant</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1352"/>
+        <location filename="../accountdetails.ui" line="1341"/>
         <source>Negotiation timeout (seconds)</source>
         <translation>Dépassement de délai (en seconde)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1470"/>
+        <location filename="../accountdetails.ui" line="1459"/>
         <source>Verify incoming certificates (server side)</source>
         <translation>Vérifier les certificats entrants (coté serveur)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1480"/>
+        <location filename="../accountdetails.ui" line="1469"/>
         <source>Verify answer certificates (client side)</source>
         <translation>Vérifier les réponses des certificats (coté client)</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>Nécessite un certificat pour les connexions TLS entrantes</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1508"/>
+        <location filename="../accountdetails.ui" line="1497"/>
         <source>Cipher</source>
         <translation>Chiffrement</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1508"/>
         <source>Use default ciphers</source>
         <translation>Utiliser les modes de chiffrements par défaut</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1529"/>
+        <location filename="../accountdetails.ui" line="1518"/>
         <source>User custom cipher list</source>
         <translation>Utiliser des modes de chiffrement spécifiques</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Enabled</source>
-        <translation>Activé</translation>
+        <translation type="vanished">Activé</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Name</source>
-        <translation>Nom</translation>
+        <translation type="vanished">Nom</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Bitrate</source>
-        <translation>taux de transfert (bit/s)</translation>
+        <translation type="vanished">taux de transfert (bit/s)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
         <source>Samplerate</source>
-        <translation>Taux d’échantillonnage</translation>
+        <translation type="vanished">Taux d’échantillonnage</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="326"/>
+        <location filename="../accountdetails.cpp" line="180"/>
         <source>Choose File</source>
         <translation>Choisir un fichier</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="328"/>
+        <location filename="../accountdetails.cpp" line="182"/>
         <source>Files (*)</source>
         <translation>Fichiers (*)</translation>
     </message>
@@ -419,88 +412,101 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
 <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>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="134"/>
+        <location filename="../callwidget.ui" line="292"/>
         <source>Call</source>
         <translation>Appel</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="148"/>
+        <location filename="../callwidget.ui" line="306"/>
         <source>Accept</source>
         <translation>Accepter</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="159"/>
+        <location filename="../callwidget.ui" line="317"/>
         <source>Refuse</source>
         <translation>Refuser</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>État:</translation>
+        <translation type="vanished">État:</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>Historique</translation>
+        <translation type="vanished">Historique</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="355"/>
         <source>Search</source>
-        <translation>Rechercher</translation>
+        <translation type="vanished">Rechercher</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="365"/>
         <source>Sort:</source>
-        <translation>Trier:</translation>
+        <translation type="vanished">Trier:</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="413"/>
         <source>Contact</source>
-        <translation>Contact</translation>
+        <translation type="vanished">Contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="123"/>
+        <location filename="../callwidget.cpp" line="133"/>
         <source>Copy number</source>
         <translation>Copier le numéro ou identifiant Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="129"/>
+        <location filename="../callwidget.cpp" line="139"/>
         <source>Add to contact</source>
         <translation>Ajouter aux contacts</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>Votre RingID est %1</translation>
+        <translation type="vanished">Votre RingID est %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>AUCUN COMPTE RING</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>Appel de %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>État d&apos;appel : %1</translation>
+        <translation type="vanished">État d&apos;appel : %1</translation>
     </message>
 </context>
 <context>
@@ -516,54 +522,63 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="48"/>
+        <location filename="../configurationwidget.ui" line="51"/>
         <source>History Settings</source>
         <translation>Paramètres de l&apos;historique</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="57"/>
+        <location filename="../configurationwidget.ui" line="60"/>
         <source>Keep History for (days)</source>
         <translation>Garder l&apos;historique pendant (jours)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="76"/>
+        <location filename="../configurationwidget.ui" line="79"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Mettre à 0 pour une durée de l&apos;historique illimitée)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="101"/>
+        <location filename="../configurationwidget.ui" line="104"/>
         <source>Clear History</source>
         <translation>Vider l&apos;historique</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
+        <location filename="../configurationwidget.ui" line="119"/>
         <source>Ringtones Selection</source>
         <translation>Choix de sonneries</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>Vidéo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="208"/>
+        <location filename="../configurationwidget.ui" line="231"/>
         <source>Device Selection</source>
         <translation>Choix de caméra</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="248"/>
+        <location filename="../configurationwidget.ui" line="271"/>
         <source>Device</source>
         <translation>Périphérique</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="271"/>
+        <location filename="../configurationwidget.ui" line="294"/>
         <source>Resolution</source>
         <translation>Résolution</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="294"/>
         <source>Framerate</source>
-        <translation>images/seconde</translation>
+        <translation type="vanished">images/seconde</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="345"/>
@@ -581,12 +596,12 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
         <translation>Lancer Ring au démarrage</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="171"/>
+        <location filename="../configurationwidget.cpp" line="177"/>
         <source>New Account</source>
         <translation>Nouveau compte</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>Êtes-vous certain de vouloir effacer l&apos;historique ?</translation>
     </message>
@@ -594,7 +609,7 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
 <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;Plusieurs méthodes de contact&gt;</translation>
     </message>
@@ -645,17 +660,17 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
         <translation>Envoyer</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="42"/>
+        <location filename="../instantmessagingwidget.cpp" line="45"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="47"/>
+        <location filename="../instantmessagingwidget.cpp" line="50"/>
         <source>Display date</source>
         <translation>Afficher la date</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="50"/>
+        <location filename="../instantmessagingwidget.cpp" line="53"/>
         <source>Display author</source>
         <translation>Afficher l&apos;auteur</translation>
     </message>
@@ -663,24 +678,20 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
 <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>Composer un numéro</translation>
+        <translation type="vanished">Composer un numéro</translation>
     </message>
     <message>
-        <location filename="../mainbar.cpp" line="32"/>
         <source>About</source>
-        <translation>À Propos</translation>
+        <translation type="vanished">À Propos</translation>
     </message>
     <message>
-        <location filename="../mainbar.cpp" line="36"/>
         <source>Exit</source>
-        <translation>Sortir</translation>
+        <translation type="vanished">Sortir</translation>
     </message>
 </context>
 <context>
@@ -690,6 +701,11 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
         <source>Ring</source>
         <translation>Ring</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>About</source>
+        <translation type="unfinished">À Propos</translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
@@ -699,40 +715,68 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
         <translation>Effectué</translation>
     </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>Pause</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="39"/>
+        <location filename="../videooverlay.ui" line="167"/>
         <source>Chat</source>
         <translation>Message texte</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>Raccrocher</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>Désactiver l&apos;audio</translation>
     </message>
     <message>
-        <location filename="../videooverlay.cpp" line="43"/>
+        <location filename="../videooverlay.cpp" line="45"/>
         <source>Mute Video</source>
         <translation>Désactiver la vidéo</translation>
     </message>
@@ -740,17 +784,17 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="184"/>
+        <location filename="../videoview.cpp" line="181"/>
         <source>Share entire screen</source>
         <translation>Partager tout l&apos;écran</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="189"/>
+        <location filename="../videoview.cpp" line="186"/>
         <source>Share screen area</source>
         <translation>Partager une partie de l&apos;écran</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="195"/>
+        <location filename="../videoview.cpp" line="192"/>
         <source>Share file</source>
         <translation>Partager un fichier</translation>
     </message>
@@ -758,19 +802,27 @@ Ring est un logiciel de communication sécurisé et distribué.</translation>
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.ui" line="429"/>
         <source>Wizard</source>
-        <translation>Assistant</translation>
+        <translation type="vanished">Assistant</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="458"/>
         <source>Greetings ! Please enter a username</source>
-        <translation>Salutation ! Veuillez entrer un nom d&apos;utilisateur.</translation>
+        <translation type="vanished">Salutation ! Veuillez entrer un nom d&apos;utilisateur.</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>Attendez s&apos;il-vous plait durant la création de votre compte.</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>
diff --git a/translations/ring_client_windows_lt.ts b/translations/ring_client_windows_lt.ts
index e6a536ea155e442a624fbcd0910f8dfe1bdeed48..6a2e5d5508b3c590524d2a96764cee101d3bb49d 100644
--- a/translations/ring_client_windows_lt.ts
+++ b/translations/ring_client_windows_lt.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="lt">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,44 +15,43 @@
         <translation>Padėkos</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>Laida : 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>Microsoft Windows kliento programa, skirta Ring.
 Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</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>versija</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="43"/>
+        <location filename="../aboutdialog.cpp" line="40"/>
         <source>Created by:</source>
         <translation>Sukūrė:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="49"/>
         <source>Artwork by:</source>
         <translation>Apipavidalino:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="53"/>
         <source>Based on the SFLPhone project</source>
         <translation>Pagrįsta SFLPhone projektu</translation>
     </message>
@@ -73,345 +74,333 @@ Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation>
         <translation>Paskyra</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="101"/>
+        <location filename="../accountdetails.ui" line="121"/>
         <source>Type</source>
         <translation>Tipas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="108"/>
+        <location filename="../accountdetails.ui" line="101"/>
         <source>Alias</source>
         <translation>Slapyvardis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="128"/>
-        <source>Hash</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="188"/>
+        <location filename="../accountdetails.ui" line="165"/>
         <source>Parameters</source>
         <translation>Parametrai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="200"/>
+        <location filename="../accountdetails.ui" line="183"/>
         <source>Hostname</source>
         <translation>Kompiuterio vardas</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>Naudotojo vardas</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>Slaptažodis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="281"/>
+        <location filename="../accountdetails.ui" line="238"/>
         <source>Proxy</source>
         <translation>Įgaliotasis serveris</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="307"/>
+        <location filename="../accountdetails.ui" line="264"/>
         <source>Voicemail number</source>
         <translation>Balso pašto numeris</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="327"/>
+        <location filename="../accountdetails.ui" line="284"/>
         <source>Auto-answer calls</source>
         <translation>Automatiškai atsiliepti į skambučius</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="337"/>
+        <location filename="../accountdetails.ui" line="294"/>
         <source>UPnP enabled</source>
         <translation>UPnP įjungta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="344"/>
+        <location filename="../accountdetails.ui" line="301"/>
         <source>DTMF tone type</source>
         <translation>DTMF tono tipas</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 type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="398"/>
+        <location filename="../accountdetails.ui" line="412"/>
         <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="405"/>
         <source>Allow Call From History</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="418"/>
+        <location filename="../accountdetails.ui" line="388"/>
         <source>Ring Account Settings</source>
         <translation>Ring Paskyros Nustatymai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="459"/>
+        <location filename="../accountdetails.ui" line="448"/>
         <source>Audio</source>
         <translation>Garsas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="545"/>
+        <location filename="../accountdetails.ui" line="534"/>
         <source>Video</source>
         <translation>Vaizdas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="561"/>
+        <location filename="../accountdetails.ui" line="540"/>
         <source>Enable Video</source>
         <translation>Įjungti Vaizdą</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="632"/>
+        <location filename="../accountdetails.ui" line="621"/>
         <source>Advanced</source>
         <translation>Išplėstiniai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="659"/>
+        <location filename="../accountdetails.ui" line="648"/>
         <source>Registration</source>
         <translation>Registracija</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="671"/>
+        <location filename="../accountdetails.ui" line="660"/>
         <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="688"/>
         <source>Network Interface</source>
         <translation>Tinklo Sąsaja</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="708"/>
+        <location filename="../accountdetails.ui" line="697"/>
         <source>Local Port:</source>
         <translation>Vietinis Prievadas:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="756"/>
+        <location filename="../accountdetails.ui" line="745"/>
         <source>Published Adress</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="771"/>
+        <location filename="../accountdetails.ui" line="760"/>
         <source>Same as local parameters</source>
         <translation>Toks pats kaip vietiniai parametrai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="784"/>
+        <location filename="../accountdetails.ui" line="773"/>
         <source>Set published address and port:</source>
         <translation>Nustatyti paskelbtą adresą ir prievadą:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="802"/>
+        <location filename="../accountdetails.ui" line="791"/>
         <source>Address</source>
         <translation>Adresas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="825"/>
+        <location filename="../accountdetails.ui" line="814"/>
         <source>Port</source>
         <translation>Prievadas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="871"/>
+        <location filename="../accountdetails.ui" line="860"/>
         <source>Use STUN</source>
         <translation>Naudoti STUN</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>Serverio URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="904"/>
+        <location filename="../accountdetails.ui" line="893"/>
         <source>Use TURN</source>
         <translation>Naudoti TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="971"/>
+        <location filename="../accountdetails.ui" line="960"/>
         <source>Realm</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="994"/>
+        <location filename="../accountdetails.ui" line="983"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></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 type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1023"/>
+        <location filename="../accountdetails.ui" line="1012"/>
         <source>Audio RTP Port Range</source>
         <translation>Garso RTP Prievadų Rėžis</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>Maž.</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>Didž.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1108"/>
+        <location filename="../accountdetails.ui" line="1097"/>
         <source>Video RTP Port Range</source>
         <translation>Vaizdo RTP Prievadų Rėžis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1198"/>
+        <location filename="../accountdetails.ui" line="1187"/>
         <source>Security</source>
         <translation>Saugumas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1225"/>
+        <location filename="../accountdetails.ui" line="1214"/>
         <source>Media Stream Encryption</source>
         <translation>Medija Srauto Šifravimas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1232"/>
+        <location filename="../accountdetails.ui" line="1221"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>Šifruoti medija srauto (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1241"/>
+        <location filename="../accountdetails.ui" line="1230"/>
         <source>Key exchange protocol</source>
         <translation>Rakto mainų protokolas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1263"/>
+        <location filename="../accountdetails.ui" line="1252"/>
         <source>Fallback on RTP on encryption failure</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1276"/>
+        <location filename="../accountdetails.ui" line="1265"/>
         <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1283"/>
+        <location filename="../accountdetails.ui" line="1272"/>
         <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1292"/>
+        <location filename="../accountdetails.ui" line="1281"/>
         <source>CA certificate</source>
         <translation>LĮ liudijimas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1302"/>
+        <location filename="../accountdetails.ui" line="1291"/>
         <source>User certificate</source>
         <translation>Naudotojo liudijimas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1312"/>
+        <location filename="../accountdetails.ui" line="1301"/>
         <source>Private key</source>
         <translation>Privatus raktas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1322"/>
+        <location filename="../accountdetails.ui" line="1311"/>
         <source>Private key password</source>
         <translation>Privataus rakto slaptažodis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1332"/>
+        <location filename="../accountdetails.ui" line="1321"/>
         <source>TLS protocol method</source>
         <translation>TLS protokolo metodas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1342"/>
+        <location filename="../accountdetails.ui" line="1331"/>
         <source>Outgoing TLS server name</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1352"/>
+        <location filename="../accountdetails.ui" line="1341"/>
         <source>Negotiation timeout (seconds)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1470"/>
+        <location filename="../accountdetails.ui" line="1459"/>
         <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1480"/>
+        <location filename="../accountdetails.ui" line="1469"/>
         <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></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 type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1508"/>
+        <location filename="../accountdetails.ui" line="1497"/>
         <source>Cipher</source>
         <translation>Šifras</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1508"/>
         <source>Use default ciphers</source>
         <translation>Naudoti numatytuosius šifrus</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1529"/>
+        <location filename="../accountdetails.ui" line="1518"/>
         <source>User custom cipher list</source>
         <translation>Naudoti tinkintą šifrų sąrašą</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Enabled</source>
-        <translation>Įjungta</translation>
+        <translation type="vanished">Įjungta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Name</source>
-        <translation>Vardas</translation>
+        <translation type="vanished">Vardas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Bitrate</source>
-        <translation>Pralaidumas</translation>
+        <translation type="vanished">Pralaidumas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
         <source>Samplerate</source>
-        <translation>Skatimeninimo dažnis</translation>
+        <translation type="vanished">Skatimeninimo dažnis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="326"/>
+        <location filename="../accountdetails.cpp" line="180"/>
         <source>Choose File</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="328"/>
+        <location filename="../accountdetails.cpp" line="182"/>
         <source>Files (*)</source>
         <translation>Failai (*)</translation>
     </message>
@@ -419,88 +408,101 @@ Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation>
 <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>Atsisakyti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="134"/>
+        <location filename="../callwidget.ui" line="292"/>
         <source>Call</source>
         <translation>Skambutis</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="148"/>
+        <location filename="../callwidget.ui" line="306"/>
         <source>Accept</source>
         <translation>Priimti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="159"/>
+        <location filename="../callwidget.ui" line="317"/>
         <source>Refuse</source>
         <translation>Atmesti</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>Būsena:</translation>
+        <translation type="vanished">Būsena:</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="251"/>
         <source>OK</source>
-        <translation>Gerai</translation>
+        <translation type="vanished">Gerai</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="329"/>
         <source>History</source>
-        <translation>Istorija</translation>
+        <translation type="vanished">Istorija</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="355"/>
         <source>Search</source>
-        <translation>Paieška</translation>
+        <translation type="vanished">Paieška</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="365"/>
         <source>Sort:</source>
-        <translation>Rikiuoti:</translation>
+        <translation type="vanished">Rikiuoti:</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>Kopijuoti numerį</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="129"/>
+        <location filename="../callwidget.cpp" line="139"/>
         <source>Add to contact</source>
         <translation>Pridėti prie kontaktų</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>Jūsų RingID: %1</translation>
+        <translation type="vanished">Jūsų RingID: %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>NERASTA RING PASKYRA</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>Skambutis nuo %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>Skambučio Būsena: %1</translation>
+        <translation type="vanished">Skambučio Būsena: %1</translation>
     </message>
 </context>
 <context>
@@ -516,54 +518,63 @@ Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation>
         <translation>Bendra</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="48"/>
+        <location filename="../configurationwidget.ui" line="51"/>
         <source>History Settings</source>
         <translation>Istorijos Nustatymai</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="57"/>
+        <location filename="../configurationwidget.ui" line="60"/>
         <source>Keep History for (days)</source>
         <translation>Laikyti Istoriją (dienų)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="76"/>
+        <location filename="../configurationwidget.ui" line="79"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Nustatykite 0 neribotai istorijai)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="101"/>
+        <location filename="../configurationwidget.ui" line="104"/>
         <source>Clear History</source>
         <translation>Išvalyti Istoriją</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
+        <location filename="../configurationwidget.ui" line="119"/>
         <source>Ringtones Selection</source>
         <translation>Skambučio Melodijų Pasirinkimas</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>Vaizdas</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="208"/>
+        <location filename="../configurationwidget.ui" line="231"/>
         <source>Device Selection</source>
         <translation>Įrenginio Pasirinkimas</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="248"/>
+        <location filename="../configurationwidget.ui" line="271"/>
         <source>Device</source>
         <translation>Įrenginys</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="271"/>
+        <location filename="../configurationwidget.ui" line="294"/>
         <source>Resolution</source>
         <translation>Raiška</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="294"/>
         <source>Framerate</source>
-        <translation>Kadrų dažnis</translation>
+        <translation type="vanished">Kadrų dažnis</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="345"/>
@@ -581,12 +592,12 @@ Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation>
         <translation>Paleisti Ring, įjungus kompiuterį</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="171"/>
+        <location filename="../configurationwidget.cpp" line="177"/>
         <source>New Account</source>
         <translation>Nauja Paskyra</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>Ar tikrai norite išvalyti visą savo istoriją?</translation>
     </message>
@@ -594,9 +605,9 @@ Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation>
 <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 type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -645,42 +656,38 @@ Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation>
         <translation>Siųsti</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="42"/>
+        <location filename="../instantmessagingwidget.cpp" line="45"/>
         <source>Copy</source>
         <translation>Kopijuoti</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="47"/>
+        <location filename="../instantmessagingwidget.cpp" line="50"/>
         <source>Display date</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="50"/>
+        <location filename="../instantmessagingwidget.cpp" line="53"/>
         <source>Display author</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <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>Rinkti Numerį</translation>
+        <translation type="vanished">Rinkti Numerį</translation>
     </message>
     <message>
-        <location filename="../mainbar.cpp" line="32"/>
         <source>About</source>
-        <translation>Apie</translation>
+        <translation type="vanished">Apie</translation>
     </message>
     <message>
-        <location filename="../mainbar.cpp" line="36"/>
         <source>Exit</source>
-        <translation>Išeiti</translation>
+        <translation type="vanished">Išeiti</translation>
     </message>
 </context>
 <context>
@@ -690,6 +697,11 @@ Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation>
         <source>Ring</source>
         <translation>Ring</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>About</source>
+        <translation type="unfinished">Apie</translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
@@ -699,58 +711,86 @@ Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation>
         <translation>Atlikta</translation>
     </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>Užlaikyta</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="39"/>
+        <location filename="../videooverlay.ui" line="167"/>
         <source>Chat</source>
         <translation>Pokalbis</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>Padėti ragelį</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 type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.cpp" line="43"/>
+        <location filename="../videooverlay.cpp" line="45"/>
         <source>Mute Video</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="184"/>
+        <location filename="../videoview.cpp" line="181"/>
         <source>Share entire screen</source>
         <translation>Bendrinti visą ekraną</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="189"/>
+        <location filename="../videoview.cpp" line="186"/>
         <source>Share screen area</source>
         <translation>Bendrinti ekrano sritį</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="195"/>
+        <location filename="../videoview.cpp" line="192"/>
         <source>Share file</source>
         <translation>Bendrinti failą</translation>
     </message>
@@ -758,19 +798,27 @@ Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation>
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.ui" line="429"/>
         <source>Wizard</source>
-        <translation>Vediklis</translation>
+        <translation type="vanished">Vediklis</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="458"/>
         <source>Greetings ! Please enter a username</source>
-        <translation>Sveiki ! Prašome įvesti naudotojo vardą</translation>
+        <translation type="vanished">Sveiki ! Prašome įvesti naudotojo vardą</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>Prašome palaukti, kol sukursime jūsų paskyrą.</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>
diff --git a/translations/ring_client_windows_ru.ts b/translations/ring_client_windows_ru.ts
index e4b2c189b451411694684bd3be35b8ea263d048f..b5a8e84490e5a8b2f017a00f15e38bd1bb633cdd 100644
--- a/translations/ring_client_windows_ru.ts
+++ b/translations/ring_client_windows_ru.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ru">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,44 +15,43 @@
         <translation>Благодарности</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="498"/>
         <source>X</source>
-        <translation>Х</translation>
+        <translation type="vanished">Х</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="568"/>
+        <location filename="../aboutdialog.ui" line="554"/>
         <source>Release : Samuel de Champlain</source>
         <translation>Автор: 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>Клиент Ring для GNOME.
 Ring это приложение для безопасного и распределенного общения. </translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="35"/>
+        <location filename="../aboutdialog.cpp" line="32"/>
         <source>Windows Ring</source>
         <translation>Клиент Ring для Windows</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="36"/>
+        <location filename="../aboutdialog.cpp" line="33"/>
         <source>version</source>
         <translation>версия</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="43"/>
+        <location filename="../aboutdialog.cpp" line="40"/>
         <source>Created by:</source>
         <translation>Авторы проекта:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="49"/>
         <source>Artwork by:</source>
         <translation>Дизайн:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="53"/>
         <source>Based on the SFLPhone project</source>
         <translation>Основан на проекте SFLPhone</translation>
     </message>
@@ -73,84 +74,83 @@ Ring это приложение для безопасного и распред
         <translation>Учетная запись</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="101"/>
+        <location filename="../accountdetails.ui" line="121"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="108"/>
+        <location filename="../accountdetails.ui" line="101"/>
         <source>Alias</source>
         <translation>Прозвище</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="128"/>
         <source>Hash</source>
-        <translation>Хэш</translation>
+        <translation type="vanished">Хэш</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="188"/>
+        <location filename="../accountdetails.ui" line="165"/>
         <source>Parameters</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="200"/>
+        <location filename="../accountdetails.ui" line="183"/>
         <source>Hostname</source>
         <translation>Имя компьютера</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>Имя пользователя</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>Пароль</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="281"/>
+        <location filename="../accountdetails.ui" line="238"/>
         <source>Proxy</source>
         <translation>Прокси</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="307"/>
+        <location filename="../accountdetails.ui" line="264"/>
         <source>Voicemail number</source>
         <translation>Номер голосовой почты</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="327"/>
+        <location filename="../accountdetails.ui" line="284"/>
         <source>Auto-answer calls</source>
         <translation>Автоответ звонков</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="337"/>
+        <location filename="../accountdetails.ui" line="294"/>
         <source>UPnP enabled</source>
         <translation>UPnP разрешен</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="344"/>
+        <location filename="../accountdetails.ui" line="301"/>
         <source>DTMF tone type</source>
         <translation>Тип тона DTMF</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>Разрешать звонки от незнакомых</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="398"/>
+        <location filename="../accountdetails.ui" line="412"/>
         <source>Allow Call From Contact</source>
         <translation>Разрешать звонки от лиц из списка контактов</translation>
     </message>
@@ -160,258 +160,251 @@ Ring это приложение для безопасного и распред
         <translation>Разрешать звонки от лиц из истории</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="418"/>
+        <location filename="../accountdetails.ui" line="388"/>
         <source>Ring Account Settings</source>
         <translation>Настройки учетной записи Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="459"/>
+        <location filename="../accountdetails.ui" line="448"/>
         <source>Audio</source>
         <translation>Голосовой</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="545"/>
+        <location filename="../accountdetails.ui" line="534"/>
         <source>Video</source>
         <translation>Видео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="561"/>
+        <location filename="../accountdetails.ui" line="540"/>
         <source>Enable Video</source>
         <translation>Включить видео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="632"/>
+        <location filename="../accountdetails.ui" line="621"/>
         <source>Advanced</source>
         <translation>Дополнительно</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="659"/>
+        <location filename="../accountdetails.ui" line="648"/>
         <source>Registration</source>
         <translation>Регистрация</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="671"/>
+        <location filename="../accountdetails.ui" line="660"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Регистрация истекает через (секунды):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="688"/>
         <source>Network Interface</source>
         <translation>Сетевой интерфейс</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="708"/>
+        <location filename="../accountdetails.ui" line="697"/>
         <source>Local Port:</source>
         <translation>Локальный порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="756"/>
+        <location filename="../accountdetails.ui" line="745"/>
         <source>Published Adress</source>
         <translation>Опубликованный адрес</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="771"/>
+        <location filename="../accountdetails.ui" line="760"/>
         <source>Same as local parameters</source>
         <translation>Такие же, как и локальные параметры</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="784"/>
+        <location filename="../accountdetails.ui" line="773"/>
         <source>Set published address and port:</source>
         <translation>Установить опубликованный адрес как порт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="802"/>
+        <location filename="../accountdetails.ui" line="791"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="825"/>
+        <location filename="../accountdetails.ui" line="814"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="871"/>
+        <location filename="../accountdetails.ui" line="860"/>
         <source>Use STUN</source>
         <translation>Исполльзовать STUN</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>Адрес сервера</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="904"/>
+        <location filename="../accountdetails.ui" line="893"/>
         <source>Use TURN</source>
         <translation>Использовать TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="971"/>
+        <location filename="../accountdetails.ui" line="960"/>
         <source>Realm</source>
         <translation>область </translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="994"/>
+        <location filename="../accountdetails.ui" line="983"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Согласование сесcии SDP (резерв ICE)</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>Данные параметры используются только во время SDP согласования сессии в случае, если ICE не поддерживается сервером или пиром.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1023"/>
+        <location filename="../accountdetails.ui" line="1012"/>
         <source>Audio RTP Port Range</source>
         <translation>Диапазон портов для RTP аудио</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>Минимум</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>Максимум</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1108"/>
+        <location filename="../accountdetails.ui" line="1097"/>
         <source>Video RTP Port Range</source>
         <translation>Диапазон портов для RTP видео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1198"/>
+        <location filename="../accountdetails.ui" line="1187"/>
         <source>Security</source>
         <translation>Безопасность</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1225"/>
+        <location filename="../accountdetails.ui" line="1214"/>
         <source>Media Stream Encryption</source>
         <translation>Шифрование медиапотока</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1232"/>
+        <location filename="../accountdetails.ui" line="1221"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>Шифровать медиапотоки (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1241"/>
+        <location filename="../accountdetails.ui" line="1230"/>
         <source>Key exchange protocol</source>
         <translation>Протокол обмена ключами</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1263"/>
+        <location filename="../accountdetails.ui" line="1252"/>
         <source>Fallback on RTP on encryption failure</source>
         <translation>Использовать RTP, если шифрование отсутствует</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1276"/>
+        <location filename="../accountdetails.ui" line="1265"/>
         <source>Negotiation Encryption</source>
         <translation>Шифрование согласования</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1283"/>
+        <location filename="../accountdetails.ui" line="1272"/>
         <source>Encrypt negotiation (TLS)</source>
         <translation>Шифровать разговор (TLS)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1292"/>
+        <location filename="../accountdetails.ui" line="1281"/>
         <source>CA certificate</source>
         <translation>CA сертификат</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1302"/>
+        <location filename="../accountdetails.ui" line="1291"/>
         <source>User certificate</source>
         <translation>Пользовательский сертификат</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1312"/>
+        <location filename="../accountdetails.ui" line="1301"/>
         <source>Private key</source>
         <translation>Приватный ключ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1322"/>
+        <location filename="../accountdetails.ui" line="1311"/>
         <source>Private key password</source>
         <translation>Пароль к приватному ключу</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1332"/>
+        <location filename="../accountdetails.ui" line="1321"/>
         <source>TLS protocol method</source>
         <translation>Метод протокола TSL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1342"/>
+        <location filename="../accountdetails.ui" line="1331"/>
         <source>Outgoing TLS server name</source>
         <translation>Исходящее имя сервера TLS</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1352"/>
+        <location filename="../accountdetails.ui" line="1341"/>
         <source>Negotiation timeout (seconds)</source>
         <translation>Ожидание разговора (секунд)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1470"/>
+        <location filename="../accountdetails.ui" line="1459"/>
         <source>Verify incoming certificates (server side)</source>
         <translation>Проверять входящие сертификаты (на стороне сервера)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1480"/>
+        <location filename="../accountdetails.ui" line="1469"/>
         <source>Verify answer certificates (client side)</source>
         <translation>Проверять исходящие сертификаты (клиент)</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>Требует сертификат для входящих TLS соединений</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1508"/>
+        <location filename="../accountdetails.ui" line="1497"/>
         <source>Cipher</source>
         <translation>Шифр</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1508"/>
         <source>Use default ciphers</source>
         <translation>Использовать шифрование по-умолчанию</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1529"/>
+        <location filename="../accountdetails.ui" line="1518"/>
         <source>User custom cipher list</source>
         <translation>Использовать пользовательский список шифров</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Enabled</source>
-        <translation>разрешен</translation>
+        <translation type="vanished">разрешен</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Name</source>
-        <translation>Имя</translation>
+        <translation type="vanished">Имя</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Bitrate</source>
-        <translation>Битрейт</translation>
+        <translation type="vanished">Битрейт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
         <source>Samplerate</source>
-        <translation>Частота дискретизации</translation>
+        <translation type="vanished">Частота дискретизации</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="326"/>
+        <location filename="../accountdetails.cpp" line="180"/>
         <source>Choose File</source>
         <translation>Выберите файл</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="328"/>
+        <location filename="../accountdetails.cpp" line="182"/>
         <source>Files (*)</source>
         <translation>Файлы (*)</translation>
     </message>
@@ -419,88 +412,101 @@ Ring это приложение для безопасного и распред
 <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>Отмена</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="134"/>
+        <location filename="../callwidget.ui" line="292"/>
         <source>Call</source>
         <translation>звонок</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="148"/>
+        <location filename="../callwidget.ui" line="306"/>
         <source>Accept</source>
         <translation>Принять</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="159"/>
+        <location filename="../callwidget.ui" line="317"/>
         <source>Refuse</source>
         <translation>Отклонить</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>Состояние:</translation>
+        <translation type="vanished">Состояние:</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>История</translation>
+        <translation type="vanished">История</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="355"/>
         <source>Search</source>
-        <translation>Поиск:</translation>
+        <translation type="vanished">Поиск:</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="365"/>
         <source>Sort:</source>
-        <translation>Упорядочить по:</translation>
+        <translation type="vanished">Упорядочить по:</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="413"/>
         <source>Contact</source>
-        <translation>Контакт</translation>
+        <translation type="vanished">Контакт</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="123"/>
+        <location filename="../callwidget.cpp" line="133"/>
         <source>Copy number</source>
         <translation>Копировать номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="129"/>
+        <location filename="../callwidget.cpp" line="139"/>
         <source>Add to contact</source>
         <translation>Добавить в контакт</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>Ваш RingID: %1</translation>
+        <translation type="vanished">Ваш RingID: %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>НЕ НАЙДЕНА УЧЕТНАЯ ЗАПИСЬ RING</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>Звонок от: %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>Состояние звонка: %1</translation>
+        <translation type="vanished">Состояние звонка: %1</translation>
     </message>
 </context>
 <context>
@@ -516,54 +522,63 @@ Ring это приложение для безопасного и распред
         <translation>Общий</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="48"/>
+        <location filename="../configurationwidget.ui" line="51"/>
         <source>History Settings</source>
         <translation>Настройки истории</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="57"/>
+        <location filename="../configurationwidget.ui" line="60"/>
         <source>Keep History for (days)</source>
         <translation>Хранить историю (дней):</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="76"/>
+        <location filename="../configurationwidget.ui" line="79"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Поставьте 0 для хранения всей истории)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="101"/>
+        <location filename="../configurationwidget.ui" line="104"/>
         <source>Clear History</source>
         <translation>Удалить историю сообщений</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
+        <location filename="../configurationwidget.ui" line="119"/>
         <source>Ringtones Selection</source>
         <translation>Выбор мелодии звонка</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>Видео</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="208"/>
+        <location filename="../configurationwidget.ui" line="231"/>
         <source>Device Selection</source>
         <translation>Выбор устройства</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="248"/>
+        <location filename="../configurationwidget.ui" line="271"/>
         <source>Device</source>
         <translation>Устройство</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="271"/>
+        <location filename="../configurationwidget.ui" line="294"/>
         <source>Resolution</source>
         <translation>Разрешение</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="294"/>
         <source>Framerate</source>
-        <translation>Частота кадров</translation>
+        <translation type="vanished">Частота кадров</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="345"/>
@@ -581,12 +596,12 @@ Ring это приложение для безопасного и распред
         <translation>Запускать Ring при старте системы</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="171"/>
+        <location filename="../configurationwidget.cpp" line="177"/>
         <source>New Account</source>
         <translation>Новая учетная запись</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>Вы уверены, что хотите удалить всю историю? </translation>
     </message>
@@ -594,7 +609,7 @@ Ring это приложение для безопасного и распред
 <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>Множественные методы связи</translation>
     </message>
@@ -645,17 +660,17 @@ Ring это приложение для безопасного и распред
         <translation>Отправить</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="42"/>
+        <location filename="../instantmessagingwidget.cpp" line="45"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="47"/>
+        <location filename="../instantmessagingwidget.cpp" line="50"/>
         <source>Display date</source>
         <translation>Отображать дату</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="50"/>
+        <location filename="../instantmessagingwidget.cpp" line="53"/>
         <source>Display author</source>
         <translation>Отображать имя</translation>
     </message>
@@ -663,24 +678,20 @@ Ring это приложение для безопасного и распред
 <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>Набрать номер</translation>
+        <translation type="vanished">Набрать номер</translation>
     </message>
     <message>
-        <location filename="../mainbar.cpp" line="32"/>
         <source>About</source>
-        <translation>О программе</translation>
+        <translation type="vanished">О программе</translation>
     </message>
     <message>
-        <location filename="../mainbar.cpp" line="36"/>
         <source>Exit</source>
-        <translation>Выход</translation>
+        <translation type="vanished">Выход</translation>
     </message>
 </context>
 <context>
@@ -690,6 +701,11 @@ Ring это приложение для безопасного и распред
         <source>Ring</source>
         <translation>кольцо</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>About</source>
+        <translation type="unfinished">О программе</translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
@@ -699,40 +715,68 @@ Ring это приложение для безопасного и распред
         <translation>Готово</translation>
     </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>Удержать</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="39"/>
+        <location filename="../videooverlay.ui" line="167"/>
         <source>Chat</source>
         <translation>Чат</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>Повесить трубку</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>Отключить звук</translation>
     </message>
     <message>
-        <location filename="../videooverlay.cpp" line="43"/>
+        <location filename="../videooverlay.cpp" line="45"/>
         <source>Mute Video</source>
         <translation>Отключить видео</translation>
     </message>
@@ -740,17 +784,17 @@ Ring это приложение для безопасного и распред
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="184"/>
+        <location filename="../videoview.cpp" line="181"/>
         <source>Share entire screen</source>
         <translation>Транслировать весь экран</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="189"/>
+        <location filename="../videoview.cpp" line="186"/>
         <source>Share screen area</source>
         <translation>Транслировать область экрана</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="195"/>
+        <location filename="../videoview.cpp" line="192"/>
         <source>Share file</source>
         <translation>Поделиться файлом</translation>
     </message>
@@ -758,19 +802,27 @@ Ring это приложение для безопасного и распред
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.ui" line="429"/>
         <source>Wizard</source>
-        <translation>Мастер</translation>
+        <translation type="vanished">Мастер</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="458"/>
         <source>Greetings ! Please enter a username</source>
-        <translation>Добро пожаловать! Пожалуйста, введите имя пользователя</translation>
+        <translation type="vanished">Добро пожаловать! Пожалуйста, введите имя пользователя</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>Подождите, пока идет создание учетной записи.</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>
diff --git a/translations/ring_client_windows_uk.ts b/translations/ring_client_windows_uk.ts
index 66d02a1f9b590ced74715bc37eddf41c07901d00..d4d02282252a61dd05cf180a6ddda2ec4cf9b59f 100644
--- a/translations/ring_client_windows_uk.ts
+++ b/translations/ring_client_windows_uk.ts
@@ -1,4 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" version="2.1">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="uk">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -10,46 +12,41 @@
     <message>
         <location filename="../aboutdialog.ui" line="475"/>
         <source>Credits</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="498"/>
-        <source>X</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.ui" line="568"/>
+        <location filename="../aboutdialog.ui" line="554"/>
         <source>Release : Samuel de Champlain</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></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 type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="35"/>
+        <location filename="../aboutdialog.cpp" line="32"/>
         <source>Windows Ring</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="36"/>
+        <location filename="../aboutdialog.cpp" line="33"/>
         <source>version</source>
         <translation>версія</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="43"/>
+        <location filename="../aboutdialog.cpp" line="40"/>
         <source>Created by:</source>
         <translation>Стоворено:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="49"/>
         <source>Artwork by:</source>
         <translation>Намальовано:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="53"/>
         <source>Based on the SFLPhone project</source>
         <translation>Базується на проекті SFLPhone</translation>
     </message>
@@ -72,84 +69,79 @@ Ring is a secured and distributed communication software.</source>
         <translation>Аккаунт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="101"/>
+        <location filename="../accountdetails.ui" line="121"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="108"/>
+        <location filename="../accountdetails.ui" line="101"/>
         <source>Alias</source>
         <translation>Додаткове ім’я</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="128"/>
-        <source>Hash</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="188"/>
+        <location filename="../accountdetails.ui" line="165"/>
         <source>Parameters</source>
         <translation>Параметри</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="200"/>
+        <location filename="../accountdetails.ui" line="183"/>
         <source>Hostname</source>
         <translation>Ім&apos;я хоста</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>Ім’я</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>Пароль</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="281"/>
+        <location filename="../accountdetails.ui" line="238"/>
         <source>Proxy</source>
         <translation>Проксі</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="307"/>
+        <location filename="../accountdetails.ui" line="264"/>
         <source>Voicemail number</source>
         <translation>Номер голосової пошти</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="327"/>
+        <location filename="../accountdetails.ui" line="284"/>
         <source>Auto-answer calls</source>
         <translation>Автоматично відповідати на дзвінки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="337"/>
+        <location filename="../accountdetails.ui" line="294"/>
         <source>UPnP enabled</source>
         <translation>UPnP влючено</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="344"/>
+        <location filename="../accountdetails.ui" line="301"/>
         <source>DTMF tone type</source>
         <translation>Тип DTMF</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>Дозволити Вхідні Від Незнайомців</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="398"/>
+        <location filename="../accountdetails.ui" line="412"/>
         <source>Allow Call From Contact</source>
         <translation>Дозволити Вхідні Від Контактів</translation>
     </message>
@@ -159,258 +151,251 @@ Ring is a secured and distributed communication software.</source>
         <translation>Дозволити Вхідні Від Контактів З Історії</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="418"/>
+        <location filename="../accountdetails.ui" line="388"/>
         <source>Ring Account Settings</source>
         <translation>Налаштування Аккаунту Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="459"/>
+        <location filename="../accountdetails.ui" line="448"/>
         <source>Audio</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="545"/>
+        <location filename="../accountdetails.ui" line="534"/>
         <source>Video</source>
         <translation>Відео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="561"/>
+        <location filename="../accountdetails.ui" line="540"/>
         <source>Enable Video</source>
         <translation>Увімкнути відео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="632"/>
+        <location filename="../accountdetails.ui" line="621"/>
         <source>Advanced</source>
         <translation>Продвинуті</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="659"/>
+        <location filename="../accountdetails.ui" line="648"/>
         <source>Registration</source>
         <translation>Реєстрація</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="671"/>
+        <location filename="../accountdetails.ui" line="660"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Час придатності регістрації (секунди):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="688"/>
         <source>Network Interface</source>
         <translation>Мережевий інтерфейс</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="708"/>
+        <location filename="../accountdetails.ui" line="697"/>
         <source>Local Port:</source>
         <translation>Локальний порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="756"/>
+        <location filename="../accountdetails.ui" line="745"/>
         <source>Published Adress</source>
         <translation>Опублікована адреса</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="771"/>
+        <location filename="../accountdetails.ui" line="760"/>
         <source>Same as local parameters</source>
         <translation>Аналогічно локальним налашуванням</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="784"/>
+        <location filename="../accountdetails.ui" line="773"/>
         <source>Set published address and port:</source>
         <translation>Встановити опубліковані адресу та порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="802"/>
+        <location filename="../accountdetails.ui" line="791"/>
         <source>Address</source>
         <translation>Адреса</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="825"/>
+        <location filename="../accountdetails.ui" line="814"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="871"/>
+        <location filename="../accountdetails.ui" line="860"/>
         <source>Use STUN</source>
         <translation>Використовувати STUN</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>URL серверу</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="904"/>
+        <location filename="../accountdetails.ui" line="893"/>
         <source>Use TURN</source>
         <translation>Використовувати TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="971"/>
+        <location filename="../accountdetails.ui" line="960"/>
         <source>Realm</source>
         <translation>Оточення</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="994"/>
+        <location filename="../accountdetails.ui" line="983"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></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>Ці налаштування використовуються лише протягом SDP  сессії у випадку коли сервер чи клієнт не підтримують ICE.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1023"/>
+        <location filename="../accountdetails.ui" line="1012"/>
         <source>Audio RTP Port Range</source>
         <translation>Порти для передачі аудіо по RTP</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>Мінімально</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>Максимально</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1108"/>
+        <location filename="../accountdetails.ui" line="1097"/>
         <source>Video RTP Port Range</source>
         <translation>Порти для передачі відео по RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1198"/>
+        <location filename="../accountdetails.ui" line="1187"/>
         <source>Security</source>
         <translation>Безпека</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1225"/>
+        <location filename="../accountdetails.ui" line="1214"/>
         <source>Media Stream Encryption</source>
         <translation>Кодування потоку</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1232"/>
+        <location filename="../accountdetails.ui" line="1221"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>Кодування потоку (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1241"/>
+        <location filename="../accountdetails.ui" line="1230"/>
         <source>Key exchange protocol</source>
         <translation>Протокол обміну ключами</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1263"/>
+        <location filename="../accountdetails.ui" line="1252"/>
         <source>Fallback on RTP on encryption failure</source>
         <translation>Використання RTP у випадку проблем з кодуванням</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1276"/>
+        <location filename="../accountdetails.ui" line="1265"/>
         <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1283"/>
+        <location filename="../accountdetails.ui" line="1272"/>
         <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1292"/>
+        <location filename="../accountdetails.ui" line="1281"/>
         <source>CA certificate</source>
         <translation>CA сертифікат</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1302"/>
+        <location filename="../accountdetails.ui" line="1291"/>
         <source>User certificate</source>
         <translation>Сертифікат користувача</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1312"/>
+        <location filename="../accountdetails.ui" line="1301"/>
         <source>Private key</source>
         <translation>Приватний ключ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1322"/>
+        <location filename="../accountdetails.ui" line="1311"/>
         <source>Private key password</source>
         <translation>Пароль від приватного ключа</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1332"/>
+        <location filename="../accountdetails.ui" line="1321"/>
         <source>TLS protocol method</source>
         <translation>Метод TLS</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1342"/>
+        <location filename="../accountdetails.ui" line="1331"/>
         <source>Outgoing TLS server name</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1352"/>
+        <location filename="../accountdetails.ui" line="1341"/>
         <source>Negotiation timeout (seconds)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1470"/>
+        <location filename="../accountdetails.ui" line="1459"/>
         <source>Verify incoming certificates (server side)</source>
         <translation>Перевірити вхідні сертифікати(на стороні сервера)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1480"/>
+        <location filename="../accountdetails.ui" line="1469"/>
         <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></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 type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1508"/>
+        <location filename="../accountdetails.ui" line="1497"/>
         <source>Cipher</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1508"/>
         <source>Use default ciphers</source>
         <translation>Використовувати шифрувальники за замовчуванням</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1529"/>
+        <location filename="../accountdetails.ui" line="1518"/>
         <source>User custom cipher list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Enabled</source>
-        <translation>Увімкнено</translation>
+        <translation type="vanished">Увімкнено</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Name</source>
-        <translation>Ім’я</translation>
+        <translation type="vanished">Ім’я</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
-        <location filename="../accountdetails.cpp" line="50"/>
         <source>Bitrate</source>
-        <translation>Бітрейт</translation>
+        <translation type="vanished">Бітрейт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="43"/>
         <source>Samplerate</source>
-        <translation>Частота дискретизації</translation>
+        <translation type="vanished">Частота дискретизації</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="326"/>
+        <location filename="../accountdetails.cpp" line="180"/>
         <source>Choose File</source>
         <translation>Вибрати файл</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="328"/>
+        <location filename="../accountdetails.cpp" line="182"/>
         <source>Files (*)</source>
         <translation>Файли (*)</translation>
     </message>
@@ -418,88 +403,97 @@ Ring is a secured and distributed communication software.</source>
 <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>Відміна</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="134"/>
+        <location filename="../callwidget.ui" line="292"/>
         <source>Call</source>
         <translation>Дзвінок</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="148"/>
+        <location filename="../callwidget.ui" line="306"/>
         <source>Accept</source>
         <translation>Прийняти</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="159"/>
+        <location filename="../callwidget.ui" line="317"/>
         <source>Refuse</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="244"/>
-        <source>State:</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.ui" line="440"/>
+        <source>Search / Enter number</source>
+        <translation type="unfinished"></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>Історія</translation>
+        <translation type="vanished">Історія</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="355"/>
         <source>Search</source>
-        <translation>Пошук</translation>
+        <translation type="vanished">Пошук</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="365"/>
         <source>Sort:</source>
-        <translation>Сорувати:</translation>
+        <translation type="vanished">Сорувати:</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="413"/>
         <source>Contact</source>
-        <translation>Контакт</translation>
+        <translation type="vanished">Контакт</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="123"/>
+        <location filename="../callwidget.cpp" line="133"/>
         <source>Copy number</source>
         <translation>Копіювати номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="129"/>
+        <location filename="../callwidget.cpp" line="139"/>
         <source>Add to contact</source>
         <translation>Додати до контактів</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>Ваш RingID: %1</translation>
+        <translation type="vanished">Ваш RingID: %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>АККАУНТ RING НЕ ЗНАЙДЕНО</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>Виклик від %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>Стус виклику: %1</translation>
+        <translation type="vanished">Стус виклику: %1</translation>
     </message>
 </context>
 <context>
@@ -515,59 +509,64 @@ Ring is a secured and distributed communication software.</source>
         <translation>Головні</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="48"/>
+        <location filename="../configurationwidget.ui" line="51"/>
         <source>History Settings</source>
         <translation>Налаштування історії</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="57"/>
+        <location filename="../configurationwidget.ui" line="60"/>
         <source>Keep History for (days)</source>
         <translation>Зберігати історію протягом (дні)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="76"/>
+        <location filename="../configurationwidget.ui" line="79"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(встановити у 0 для безкінечної історії)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="101"/>
+        <location filename="../configurationwidget.ui" line="104"/>
         <source>Clear History</source>
         <translation>Очистити історію</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
+        <location filename="../configurationwidget.ui" line="119"/>
         <source>Ringtones Selection</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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="166"/>
+        <location filename="../configurationwidget.ui" line="189"/>
         <source>Video</source>
         <translation>Відео</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="208"/>
+        <location filename="../configurationwidget.ui" line="231"/>
         <source>Device Selection</source>
         <translation>Вибір пристрою</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="248"/>
+        <location filename="../configurationwidget.ui" line="271"/>
         <source>Device</source>
         <translation>Пристрій</translation>
     </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="271"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="../configurationwidget.ui" line="294"/>
-        <source>Framerate</source>
-        <translation type="unfinished"/>
+        <source>Resolution</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="345"/>
         <source>Camera Preview</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="371"/>
@@ -580,12 +579,12 @@ Ring is a secured and distributed communication software.</source>
         <translation>Запускати із системою</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="171"/>
+        <location filename="../configurationwidget.cpp" line="177"/>
         <source>New Account</source>
         <translation>Новий Аккаунт</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>Ви все ще бажаєте очистити історію?</translation>
     </message>
@@ -593,9 +592,9 @@ Ring is a secured and distributed communication software.</source>
 <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 type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -644,17 +643,17 @@ Ring is a secured and distributed communication software.</source>
         <translation>Відправити</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="42"/>
+        <location filename="../instantmessagingwidget.cpp" line="45"/>
         <source>Copy</source>
         <translation>Копіювати</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="47"/>
+        <location filename="../instantmessagingwidget.cpp" line="50"/>
         <source>Display date</source>
         <translation>Відобразити дату</translation>
     </message>
     <message>
-        <location filename="../instantmessagingwidget.cpp" line="50"/>
+        <location filename="../instantmessagingwidget.cpp" line="53"/>
         <source>Display author</source>
         <translation>Відобразити автора</translation>
     </message>
@@ -662,24 +661,20 @@ Ring is a secured and distributed communication software.</source>
 <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>Номер</translation>
+        <translation type="vanished">Номер</translation>
     </message>
     <message>
-        <location filename="../mainbar.cpp" line="32"/>
         <source>About</source>
-        <translation>Про программу</translation>
+        <translation type="vanished">Про программу</translation>
     </message>
     <message>
-        <location filename="../mainbar.cpp" line="36"/>
         <source>Exit</source>
-        <translation>Вийти</translation>
+        <translation type="vanished">Вийти</translation>
     </message>
 </context>
 <context>
@@ -689,6 +684,11 @@ Ring is a secured and distributed communication software.</source>
         <source>Ring</source>
         <translation>Ring</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>About</source>
+        <translation type="unfinished">Про программу</translation>
+    </message>
 </context>
 <context>
     <name>NavBar</name>
@@ -698,40 +698,68 @@ Ring is a secured and distributed communication software.</source>
         <translation>Готово</translation>
     </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>Режим очікування</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="39"/>
+        <location filename="../videooverlay.ui" line="167"/>
         <source>Chat</source>
         <translation>Чат</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 type="unfinished"/>
+        <translation type="unfinished"></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>Відключити звук</translation>
     </message>
     <message>
-        <location filename="../videooverlay.cpp" line="43"/>
+        <location filename="../videooverlay.cpp" line="45"/>
         <source>Mute Video</source>
         <translation>Відключити відео</translation>
     </message>
@@ -739,17 +767,17 @@ Ring is a secured and distributed communication software.</source>
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="184"/>
+        <location filename="../videoview.cpp" line="181"/>
         <source>Share entire screen</source>
         <translation>Поділитися частиною екрану</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="189"/>
+        <location filename="../videoview.cpp" line="186"/>
         <source>Share screen area</source>
         <translation>Поділитися екраном</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="195"/>
+        <location filename="../videoview.cpp" line="192"/>
         <source>Share file</source>
         <translation>Відправити файл</translation>
     </message>
@@ -757,19 +785,23 @@ Ring is a secured and distributed communication software.</source>
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.ui" line="429"/>
-        <source>Wizard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="458"/>
         <source>Greetings ! Please enter a username</source>
-        <translation>Вітаю! Будьласка, введіть своє ім’я.</translation>
+        <translation type="vanished">Вітаю! Будьласка, введіть своє ім’я.</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>Почекайте пока ваш аккаунт створюється.</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>