commit 1404f96e0d942e957bbccc2ea1ef6d32e1a7dec3
author Jenkins <jenkins@ring-packaging.cx> Mon Sep 25 03:40:53 2017 -0400
committer Jenkins <jenkins@ring-packaging.cx> Mon Sep 25 03:40:53 2017 -0400
tree 7755841caa7e331e3eb73457947c36c721566a8b
parent 7707b4cc2c37265264f3485dc195e1f379463a9e

i18n: automatic bump

Change-Id: Id917cae69fb9fe6cbfe05f4b3164d00bf573a639

translations/ring_client_windows.ts

diff --git a/translations/ring_client_windows.ts b/translations/ring_client_windows.ts
index 6afee90..0252dc9 100644
--- a/translations/ring_client_windows.ts
+++ b/translations/ring_client_windows.ts
@@ -5,22 +5,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation type="unfinished"></translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"></translation>
@@ -54,90 +64,115 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -148,236 +183,448 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"></translation>
     </message>
@@ -430,12 +677,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -443,12 +700,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -456,104 +728,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"></translation>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
@@ -1059,22 +1592,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"></translation>
@@ -1233,67 +1817,67 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,71 +1891,206 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>

translations/ring_client_windows_ar.ts

diff --git a/translations/ring_client_windows_ar.ts b/translations/ring_client_windows_ar.ts
index 22f3be6..8687518 100644
--- a/translations/ring_client_windows_ar.ts
+++ b/translations/ring_client_windows_ar.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>عن RING</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>الأطراف المصممة</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>وسيط Microsoft Windows إلى Ring
@@ -53,90 +63,115 @@
         <translation>إعدادات</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>عام</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>حساب</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>النوع</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>الاسم المستعار</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>المعلمات</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>اسم المضيف</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>اسم المستخدم</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>كلمة السر</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>الوكيل</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>رقم البريد الصوتي</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>رد ألي على المكالمات</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>تفعيل UPnP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>إسمح لأشخاص  مجهولة بالإتصال</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>إسمح للأشخاص في قائمة الإتصالات المعروفة بالإتصال</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>إسمح  للأشخاص  في تاريخ  المكالمات  بالإتصال</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>إعدادات الحساب Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>تشغيل</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>صوت/فيديو</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>مرمّزات الصوت</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>مرمّزات الفيديو</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>إعدادات متقدمة</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>التسجيل</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>إنقضاء فترة التسجيل (ثواني):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>واجهة الشبكة</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>نقطة عبور ( port ) محلية</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>مثل المعلمات المحلية</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>وضع العنوان و نقطة العبور المنشورة</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>العنوان</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>نقطة عبور ( port )</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>إستعمل STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>عنوان خادم التطبيق</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>إستعمل TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>حقل ( realm )</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>جلسة تفاوض SDP (حل تعويض ICE)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>نطاق المنفذ RTP الصوتي</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>الحد الأدنى</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>الحد الاقصى</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>نطاق المنفذ RTP فيديو</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>تأمين</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>ألغِ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>موافق</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>تشفير تيار الميديا (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>العنوان المنشور</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>شهادة CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>شهادة المستخدم</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>المفتاح الخاص</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>كلمة سر المفتاح الخاص</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>إستعمل قائمة الشيفرة المبدئية</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>استمارة</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>أو أكتب رقما</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>نقل</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>محادثات</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>قائمة الإعدادات</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>شارك عنوان Ring الخاص بك</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>هاذا معرفك RingI
 انسخه و بثه لأصدقائك!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>خطأ عند محاولة تولد الرمز الشريطي</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>أضف إلى الاتصالات المعروفة</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>ابدأ المحادثة !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>يريد التحدث إليك!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>أجب</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>تجاهل</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>يتّصل</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>ألغِ</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>مكالمة</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>إعدادات</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>عام</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>إعدادات التاريخ</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>أبقي على التاريخ ل (أيام)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(ضع صفر لتاريخ غير محدود)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>أزل التاريخ</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>إعدادات متنوعة</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>أبقي مصغر عند الغلق</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>فيديو</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>خذ لمحة</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>الاسم</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>تسجيل الإعدادات</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>حفظ في:</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>البحث عن تحديثات تلقائيًا كل</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>أيام</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>المعاينة غير متوفرة أثناء المكالمة</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>إختيارات الأجهزة</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>جهاز</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>دقة العرض (resolution)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>جهاز الإخراج</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>جهاز الإدخال</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>إضافة حساب جديد</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>استيراد</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>تصدير</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>حساب</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>إطلق Ring عند بدء التشغيل</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>حساب جديد</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>هل أنت متأكد من حذف تاريخك  ؟</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>إبحث...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>أحدث إتصال جديد</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>إتصال جديد</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>أدخل اسم هنا</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>أحدث</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>اقبل</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>استمارة</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>ألغِ</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>موافق</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>ألغِ</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>إحذف</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>إبعث رسالة نصية...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>إنسخ</translation>
@@ -1059,22 +1592,27 @@
         <translation>استمارة</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>استيراد</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>آلي</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>كتم اللاقط</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>الجودة</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>أضف إلى الاتصال</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>أنهي المحادثة</translation>
@@ -1233,67 +1817,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>مجهول</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,71 +1891,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>اختر اسم مستخدمك</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>كلمة السر</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>إحداث حسابك Ring...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>التالي</translation>
     </message>

translations/ring_client_windows_bg.ts

diff --git a/translations/ring_client_windows_bg.ts b/translations/ring_client_windows_bg.ts
index c751e87..41eb0d0 100644
--- a/translations/ring_client_windows_bg.ts
+++ b/translations/ring_client_windows_bg.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Относно</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Заслуги</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>Свобода, равенство, братство - Версия 1.0</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Клиентът на Ring за Уиндоус.
@@ -53,90 +63,115 @@
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Общи</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Акаунт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Псевдоним</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Параметри</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Име на сървъра</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Потребителско име</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Парола</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Прокси</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Номер на гласова поща</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Авт. отговор на обажданията</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP е активиран</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Позволяване на обажданията от непознати</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Позволяване на обажданията от контакти</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Позволяване на обажданията от хора в историята</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>Общодостъпно потребителско име</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Настройки на акаунта за Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Избор на тон за звънене</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Пускане</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Звук/видео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Аудио кодеци</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Видео кодеци</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Разширени</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Регистрация</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Годност на регистрацията (секунди):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Мрежова карта</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Местен порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Използване на местните параметри</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Задаване на публикувания адрес и порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Използване на STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>Адрес на сървъра</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Използване на TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Област</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Максимум</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Сигурност</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Устройства</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Добавяне на устройство</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>За да добавите ново устройство в своя акаунт в Ring, трябва да изнесете акаунта си в Ring. Това ще Ви даде ПИН-код, който трябва да бъде въведен на новото устройство в рамките на 5 минути от създаването си.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>Парола (задължително)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Отказ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Създаденият за Вас Личен Разпознавателен Код</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>Личен Разпознавателен Код</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>Добре</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>Блокирани контакти</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Публикуван адрес</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>Сертификат от център за сертифициране</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Потребителски сертификат</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Частен ключ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Парола за частен ключ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Използване на шифри по подразбиране</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>Блокирани IP</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>Отблокиране на контакт и добавяне в списъка с контакти</translation>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>или въведете номер…</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Прехвърляне</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Потърсете контакти или въведете ид. за Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Разговори</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Заявки за нови контакти</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>меню за настройки</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring е безплатен софтуер за универсална комуникация, който уважава свободата и личните данни на потребителите си.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Споделете своя идентификатор за Ring</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Това е Вашият идентификатор за Ring.
 Копирайте го и го споделете с приятелите си!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Грешка при създаването на QR-код</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Добавяне към контактите</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Начало на разговора!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>изпращане на съобщение</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Желае да говори с Вас!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Отговор</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Игнориране</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Обаждане</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Отказ</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Обаждане</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Общи</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>изход от менюто за настройки</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Настройки на историята</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Пазене на историята (в дни)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(0 означава безкрайна история)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Изчистване на историята</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Разнообразни настройки</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Минимизиране при затваряне</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Видео</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Профил</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Име</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Настройки за записването</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Запазване в:</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Постоянно записване</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Проверка за обновления на всеки</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>дни</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Прегледът не е възможен по време на разговор</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Избор на устройство</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Устройство</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Разделителна способност</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Изходящо устройство</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Входящо устройство</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>добавяне на нов акаунт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Внасяне</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Изнасяне</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Акаунт</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Пускане на Ring със системата</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Нов акаунт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Наистина ли искате да изчистите цялата история?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Избиране на папка</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Възникна грешка при внасянето на акаунта.</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Търсене…</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Създаване на нов контакт</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Нов контакт</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Въведете име…</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Създаване</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Приемане</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Блокиране</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>От</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Отказ</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Добре</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Отказ</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Изтриване</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Изпратете текстово съобщение…</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Копиране</translation>
@@ -1059,22 +1592,27 @@
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Направи снимка</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>или</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Внасяне</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Авт.</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Заглушаване на микрофона</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Качество</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Етикет за името</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Добавяне към контакт</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Изминало време</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Затваряне</translation>
@@ -1233,67 +1817,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Свързване на това устройство с акаунт</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,71 +1891,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Създаване на профил</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Изберете потребителско име</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Регистриране на публично име (експериментално)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Парола</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Потвърдете паролата</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Създаване на Вашия акаунт в Ring…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Предишен</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Напред</translation>
     </message>

translations/ring_client_windows_ca.ts

diff --git a/translations/ring_client_windows_ca.ts b/translations/ring_client_windows_ca.ts
index b83083a..45b2489 100644
--- a/translations/ring_client_windows_ca.ts
+++ b/translations/ring_client_windows_ca.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Quant a</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Crèdits</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation>Opcions</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Tipus</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Àlies</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Nom d&apos;amfitrió</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Nom d&apos;usuari</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Contrasenya</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Intermediari</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Nombre de correu de veu</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Autorespondre trucades</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP habitlitat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>Direcció del servidor de noms</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Reproduir</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Avançat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Registre</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Temps d&apos;expiració del registre (segons):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Interfície de xarxa</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Igual que els paràmetres locals</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Establir port i adreça públics:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Adreça</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Utilitza STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Utilitza TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Rang de ports de l&apos;àudio RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Mín</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Màx</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Seguretat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Dispositius</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Afegir dispositiu</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>D&apos;acord</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Adreça publicada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>Certificat CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Certificat d&apos;usuari</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Clau privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Contrasenya de la clau privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Utilitza xifrats per defecte</translation>
     </message>
@@ -428,12 +675,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation type="unfinished"/>
     </message>
@@ -454,105 +726,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Converses</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Peticions de contacte</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>El Ring és un programari per a comunicacions universals que respecta la llibertat i privacitat dels seus usuaris</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Aquest és el vostre RingID.
 Copieu i compartiu amb les vostres amistats!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Afegir als contactes</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Trucada</translation>
     </message>
@@ -645,6 +959,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -652,167 +974,283 @@
         <translation>Opcions</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Preferències d&apos;historial</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Vídeo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Dispositiu</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Importa</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Exporta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Compte</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Compte Nou</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -826,26 +1264,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Crear</translation>
     </message>
@@ -873,17 +1336,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Accepta</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Bloqueja</translation>
     </message>
@@ -895,6 +1373,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -920,11 +1413,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"/>
     </message>
@@ -943,16 +1446,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Suprimeix</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -960,11 +1478,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation type="unfinished"/>
@@ -1058,22 +1591,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Fer foto</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Importa</translation>
     </message>
@@ -1105,12 +1643,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1166,36 +1740,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1232,67 +1816,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Desconegut</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Enllaça aquest dispositiu a un compte</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,71 +1890,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Crei el seu perfil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Contrasenya</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Generant el vostre compte de Ring...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Següent</translation>
     </message>

translations/ring_client_windows_cs_CZ.ts

diff --git a/translations/ring_client_windows_cs_CZ.ts b/translations/ring_client_windows_cs_CZ.ts
index 8514106..8ba7a32 100644
--- a/translations/ring_client_windows_cs_CZ.ts
+++ b/translations/ring_client_windows_cs_CZ.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>O aplikaci</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Zásluhy</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>Svoboda, rovnost, bratrství - verze 1.0</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Klient Microsoft Windows pro Ring.
@@ -53,90 +63,115 @@
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Přezdívka</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parametry</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Název serveru</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Uživatelské jméno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Číslo hlasové schránky</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Automaticky přijímat hovory</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP povoleno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Povolit hovory od neznámých</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Povolit hovory od kontaktů</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Povolit hovory z Historie</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>Veřejné uživatelské jméno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation>Zaregistrovat uživatelské jméno na blockchainu</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>Adresa jmenné služby</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Nastavení účtu Ringu</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Výběr vyzváněcí melodie</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Přehrát</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Zvuk/Obraz</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Zvukové kodeky</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Obrazové kodeky</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Pokročilé</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Registrace</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Vypršení registrace (v sekundách):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Síťové rozhraní</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Místní port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Stejné jako místní parametry</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Zadat veřejnou adresu a port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Adresa</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Použít STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>URL serveru</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Použít TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Oblast</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Vyjednávání sezení SDP (ICE Fallback)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Tato nastavení jsou použita jen během vyjednávání sezení SDP, v případě že ICE není podporováno serverem nebo peerem.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Rozsah portů pro zvuk RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Rozsah portů pro obraz RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Zabezpečení</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Šifrování datového toku (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Zařízení</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Přidat zařízení</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>Abyste si ke svému účtu Ring přidali nové zařízení, exportujte si účet na Ring. Tím získáte PIN, který musíte do 5 minut od jeho vytvoření zadat na svém novém zařízení.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>Heslo (vyžadováno)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Exportovat na Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Váš vygenerovaný PIN:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>Zakázané kontakty</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Šifrovat datový tok (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Zveřejněná adresa</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>CA certifikát</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Uživatelský certifikát</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Soukromý klíč</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Heslo soukromého klíče</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Použít výchozí šifry</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Formulář</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>Zakázané ID</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>Zrušit zákaz kontaktu, a přidat jej do seznamu spojení</translation>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>nebo vložte číslo...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Přenos dat</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Hledejte kontakty nebo zadejte Ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Konverzace</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Žádosti o kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>nabídka nastavení</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring je svobodný software určený k univerzální komunikaci, který respektuje svobody a práva uživatelů.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Sdílet vaše Ring ID</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Toto je vaše RingID.
 Kopírujte a sdílejte jej s přáteli!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>Dvakrát klepněte pro kopírování</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Chyba při vytváření QR kódu</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Přidat do kontaktů</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Začněte konverzaci !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>Zde zadejte svoji zprávu</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>odeslat zprávu</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation>BestId</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Chce s vámi hovořit!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Přijmout</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Přehlížet</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Volání</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Volat</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>ukončit nabídku nastavení</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Nastavení historie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Uchovávat historii po (dny)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Nastavte na 0 pro neomezenou historii)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Vymazat historii</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Smíšená natavení</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Neukončovat Ring po uzavření okna</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>Zkontrolovat aktualizace nyní</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Obraz</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Nastavení nahrávání</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Uložit do :</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Vždy nahrávat</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>Povolit oznámení</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Kontrolovat aktualizace každých</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>dní</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Náhled během hovoru nedostupný</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Výběr zařízení</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Zařízení</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Rozlišení</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Výstupní zařízení</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Vstupní zařízení</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>přidat nový účet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Importovat</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Exportovat</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Účet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Spouštět Ring po spuštění systému</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Nový účet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Opravdu chcete vymazat všechnu svou historii?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Vyberte adresář</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Chyba při zavádění účtu.</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Hledat...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Vytvořit nový kontakt</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Nový kontakt</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Zde vložte jméno...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Vytvořit</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation>bestIdLabel</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Přijmout</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation>Zahodit</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Blokovat</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>Formulář</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Odstranit</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Odeslat textovou zprávu...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Zkopírovat</translation>
@@ -1059,22 +1592,27 @@
         <translation>Formulář</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Vyfotit</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>nebo</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Importovat</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Automaticky</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Ztlumit mikrofon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Jakost</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Spojit hovory</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Jmenný štítek</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Přidat do kontaktů</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Uplynulý čas</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Zavěsit</translation>
@@ -1233,67 +1817,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation>Přesunuje se váš účet Ring…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation>Registruje se vaše veřejné uživatelské jméno. Může to trvat několik minut...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>Přidat zařízení</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>Uživatelské jméno není dostupné.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>Uživatelské jméno je dostupné.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>Uživatelské jméno je neplatné.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>Chyba sítě.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>Vytvořit účet Ring</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Připojit toto zařízení k účtu</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>Jak přidat zařízení</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation>Vítejte v</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,71 +1891,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Vytvořit vlastní profil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Vytvořit vlastní účet</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Zvolte si uživatelské jméno</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>Hledá se...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Zaregistrovat jméno veřejně (experimentální)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>Zadejte PIN</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Potvrdit heslo</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Vytváří se váš účet Ring…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Předchozí</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Další</translation>
     </message>

translations/ring_client_windows_da_DK.ts

diff --git a/translations/ring_client_windows_da_DK.ts b/translations/ring_client_windows_da_DK.ts
index 44840b3..4d50075 100644
--- a/translations/ring_client_windows_da_DK.ts
+++ b/translations/ring_client_windows_da_DK.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Krediteringer</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>Liberté, Égalité, Fraternité - Version 1.0</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Microsoft Windows klient til Ring.
@@ -53,90 +63,115 @@
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Generelt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Alias</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parametre</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Værtsnavn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Brugernavn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Adgangskode</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Stedfortræder</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Telefonsvarernummer</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Svar automatisk opkald</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP aktiveret</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Tillad opkald fra ukendt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Tillad opkald fra kontakt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Tillad opkald fra historik</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>Offentligt brugernavn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation>Registrer på blockchain</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>Navnetjeneste-URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Indstillinger for Ring-konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Valg af ringetone</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Afspil</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Lyd/video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Audio-codec&apos;er</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Video-codec&apos;er</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Avanceret</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Registrering</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Tidsgrænse for registrering (sekunder):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Netværksinterface</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Lokal port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Samme som lokale parametre</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Sæt offentliggjorte adresse og port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Brug STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>Server-URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Brug TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Realm</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP Sessions-forhandling (ICE-tilbagefald)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Disse indstillinger bruges kun under SDP-sessiinsforhandling hvis ICE ikke understøttes af serveren eller modparten.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Område for lyd RTP-port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Maks</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Område for video RTP-port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Sikkerhed</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Mediestrøm kryptering (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Enheder</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Tilføj enhed</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>For at tilføje en ny enhed til din Ring-konto skal den eksporteres til Ring. Dette vil generere en PIN-kode som skal indtastes på den nye enhed indenfor 5 minutter,</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>Adgangskode (påkrævet)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Eksporter til Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Din genererede PIN-kode:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation>Denne PIN skal indtastes på den nye enhed inden for 5 minutter. Du kan til enhver tid generere en ny.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>Blokerede kontakter</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Kryptér mediastrøm (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Publiceret Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>CA-certifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Brugercertifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Privat nøgle</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Adgangskode til privat nøgle</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Brug standardcifre</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>Blokeret ID</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>Ubloker kontakt, og tilføj til kontaktliste</translation>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>eller angiv nummer...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Overfør</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Søg efter kontakter eller indtast RingID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Samtaler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Kontaktforespørgsler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>indstillingsmenu</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring er fri software til universel kommunikation som respekterer sine brugeres frihed og privatliv.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Del din RingID</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Dette er dit RingID.
 Kopiér og del den med dine venner!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>Dobbeltklik for at kopiere</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Fejl ved generering af QR code</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Tilføj til kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Start samtalen!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>Skriv din besked her</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>send besked</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation>BestId</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Vil tale med dig!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Besvar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Afvis</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Ringer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Ring op</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Generelt</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>afslut indstillingsmenu</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Historik-indstillinger</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Behold historik i (dage)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Sæt til 0 for ubegrænset historik)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Ryd historik</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Diverse indstillinger</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Hold minimeret ved lukning</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>Søg efter for opdateringer nu</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Optage-indstillinger</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Gem i:</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Optag altid</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>Aktiver notifikationer</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Søg automatisk efter opdateringer hver</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>dage</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Forhåndsvisning ikke tilgængelig under samtale</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Valg for enhed</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Enhed</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Opløsning</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Output Enhed</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Input Enhed</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>tilføj ny konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Importér</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Eksport</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Start Ring ved opstart</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Ny konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Er du sikker på, at du vil slette al din historik?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Vælg folder</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>En fejl opstod ved import af konto</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Søg...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Opret ny kontakt</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Ny kontakt</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Skriv navn her...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Opret</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation>bedsteIdEtiket</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Accepter</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation>Fjern</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Blokér</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>Form</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation>Slet og bloker</translation>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Send tekst besked...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Kopiér</translation>
@@ -1059,22 +1592,27 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Tag billede</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>eller</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation>Importer foto</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Importér</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Auto</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Sluk mikrofon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Kvalitet</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Sammenføj samtaler</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Navne etiket</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Føj til kontakt</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Tid gået</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Læg på</translation>
@@ -1233,67 +1817,67 @@
         <translation>Din konto kræver migrering. Indtast din adgangskode.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation>Migrerer din Ring-konto....</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation>Registrerer dit offentlige brugernavn, dette kan tage et par minutter...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>Tilføj enhed</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>Brugernavn er ikke tilgængeligt.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>Brugernavn tilgængeligt.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>Brugernavn ikke gyldigt.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>Netværksfejl.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>Opret Ring-konto</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Tilknyt denne enhed til en konto</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>Hvordan man tilføjer en enhed</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation>Velkommen til</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1316,71 +1900,206 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Du vil nu få PIN-koden som skal indtastes her. Den er kun gyldig i &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutter&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Opret din profil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation>Skriv dit fulde navn:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Opret din konto</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Vælg dit brugernavn</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>Søger...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation>Registrer dit brugernavn i Ring. Dette vil reservere brugernavnet så kun du kan anvende det. Dine venner vil være i stand til at ringe til dig ved brug af dette brugernavn, i stedet for dit RingID.</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Registrer offentligt brugernavn (eksperimentel funktionalitet)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>Indtast din PIN</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Adgangskode</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Bekræft adgangskode</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Genererer din Ring-konto...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Tilbage</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Næste</translation>
     </message>

translations/ring_client_windows_de.ts

diff --git a/translations/ring_client_windows_de.ts b/translations/ring_client_windows_de.ts
index 12face1..e8433dc 100644
--- a/translations/ring_client_windows_de.ts
+++ b/translations/ring_client_windows_de.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Würdigung</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>Freiheit, Gleichheit, Brüderlichkeit - Version 1.0</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <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.
@@ -53,90 +63,115 @@
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Aliasname</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Rechnername</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Nummer für Sprachnachrichten</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Anrufe automatisch beantworten</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP aktiviert</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Anruf von Unbekannt erlauben</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Anruf von Kontakt erlauben</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Anruf von Verlauf erlauben</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>Öffentlicher Benutzername</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation>Den Benutzernamen auf der Blockchain registrieren.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>URL des Namensservers</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Ring-Kontoeinstellungen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Klingelton wählen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Abspielen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Audio Codecs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Video Codecs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Erweitert</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Registrierung</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Registrierungsverfallzeitüberschreitung (Sekunden):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Netzwerkschnittstelle</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Lokaler Port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Identisch zu den lokalen Parametern</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Veröffentlichte Adresse und Port setzen:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>STUN benutzen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>Server URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Turn benutzen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Bereich</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP Sitzungsverhandlung (ICE Fallback)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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 für eine SDP-Sitzungsverhandlung im Falle, dass ICE vom Server oder vom Teilnehmer nicht unterstützt wird.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Audio RTP Portbereich</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Video RTP Portbereich</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Sicherheit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Media Stream Encryption (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Geräte</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Gerät hinzufügen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>Um einen neues Gerät mit Ihrem Ring-Konto zu verknüpfen, mussen Sie Ihr Konto exportieren. Dabei wird ein PIN-Nummer generiert, der bei Ihrem neuen Gerät innerhalb von 5 Minuten eingegeben werden muss.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>Passwort (erforderlich)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Zu Ring exportieren</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Ihre generierte PIN:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation>Bitte gib Deine PIN auf dem neuen Gerät innerhalb von 5 minuten ein. Du kannst jederzeit eine neue PIN generieren.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>Gesperrte Kontakte</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Medienströme verschlüsseln (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Veröffentlichte Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>CA-Zertifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Benutzerzertifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Privater Schlüssel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Passwort für den privaten Schlüssel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Standardcipher verwenden</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>Gebannte ID</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>Kontakt entbannen und zur Kontaktliste hinzufügen</translation>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>oder Nummer eingeben...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Transfer</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Kontakte suchen oder Nummer eingeben</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Unterhaltungen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Kontaktanfragen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring ist eine Freie Software für universelle Kommunikation und respektiert die Freiheiten und Privatsphäre der Benutzer.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Ring-ID teilen</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Dies ist Ihre Ring-ID.
 Kopieren und teilen Sie sie mit ihren Freunden!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>Doppelklick zum kopieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Fehler bei der Erstellung des QR-Codes</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Zu Kontakten hinzufügen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Unterhaltung starten!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>Schreibe deine Nachricht hier</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>Nachricht senden</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation>BestID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Möchte mit dir Sprechen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Antwort</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Ignorieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Rufaufbau</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Anruf</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation>Konten</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>Einstellungen verlassen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Verlaufseinstellungen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Verlauf behalten für (Tage)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <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="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Verlauf leeren</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Andere Einstellungen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Beim Schließen minimiert bleiben</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>Aktualisieren</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Aufnahme-Einstellungen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Speichern unter:</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Immer aufnehmen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>Benachrichtigungen aktivieren</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Automatisch auf Aktualisierungen prüfen. Alle</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>Tage</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Vorschau während Anruf nicht verfügbar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Geräteauswahl</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Gerät</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Auflösung</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Ausgabegerät</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Aufnahmegerät</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>Neues Konto hinzufühgen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Import</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Export</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Ring beim Hochfahren starten</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Neues Konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <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>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Verzeichnis wählen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Ein Fehler ist während des Imports des Benutzerkontos aufgetreten</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Suchen...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Neuen Kontakt erstellen</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Neuer Kontakt</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Hier einen Namen eingeben...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Erstellen</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Akzeptieren</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation>Verwerfen</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Sperren</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>Formular</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation>Löschen und sperren</translation>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Textnachricht senden</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
@@ -1059,22 +1592,27 @@
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Ein Foto aufnehmen</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>oder</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation>Foto importieren</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Import</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Automatisch</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Mikrofon stummschalten</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Qualität</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Anruf beitreten</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Namenslabel</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Kontakt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Zeit vergangen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation>Einstellungen</translation>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Auflegen</translation>
@@ -1233,67 +1817,67 @@
         <translation>Ihr Ring-Konto muss migriert werden. Bitte geben Sie Ihr Passwort ein.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation>Ihr RIng-Konto wird migriert...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation>Dein öffentlicher Benutzername wird registriert, das kann ein paar Minuten dauern...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>Gerät hinzufügen</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>Benutzername nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>Benutzername verfügbar.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>Benutzername ist ungültig.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>Netzwerkfehler</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>Ein Ring-Konto erstellen</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Dieses Gerät mit einem Konto verknüpfen</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>Wie kann ich ein neues Gerät hinzufügen</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation>Willkommen bei</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,71 +1891,206 @@
         <translation>1</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Erstellen Sie Ihr Profil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation>Geben Sie Ihren vollständigen Namen ein</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Legen Sie ein Benutzerkonto an</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Nutzername wählen</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>Suchen...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation>Registriere deinen Benutzernamen bei Ring. Dadurch wird der Benutzername reserviert, sodass nur du ihn benutzen kannst. Deine Freunde werden die Möglichkeit haben dich mit Hilfe deines Benutzernamens anzurufen anstatt dafür deine RingID zu benutzen.</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Melden Sie sich für einen allgemein-bekannten Benutzername an (experimentell)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>Geben Sie Ihre PIN ein</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Passwort bestätigen</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Ihr Ring-Konto wird generiert...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Vorherige</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Weiter</translation>
     </message>

translations/ring_client_windows_de_DE.ts

diff --git a/translations/ring_client_windows_de_DE.ts b/translations/ring_client_windows_de_DE.ts
index 651ab46..e37efcd 100644
--- a/translations/ring_client_windows_de_DE.ts
+++ b/translations/ring_client_windows_de_DE.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Abspann</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,91 +62,116 @@
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Alias</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parameter</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>
     Passwort</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Voicemail-Rufnummer</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP aktiviert</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Wiedergeben</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Erweitert</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Netzwerkschnittstelle</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>TURN benutzen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Sicherheit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>Okay</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Privater Schlüssel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -429,12 +676,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Übertragung</translation>
     </message>
@@ -455,104 +727,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Kontaktanfragen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring ist Freie Software für universelle Kommunikation, die die Freiheiten und die Privatsphäre ihrer Nutzer respektiert.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Kontakte hinzufügen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Antwort</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Rufen an</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Anrufen</translation>
     </message>
@@ -645,6 +959,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -652,167 +974,283 @@
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>Tage</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Gerät</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Exportieren</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -826,26 +1264,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Neuer Kontakt</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Erstellen</translation>
     </message>
@@ -873,17 +1336,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Akzeptieren</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Blockieren</translation>
     </message>
@@ -895,6 +1373,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -920,11 +1413,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"/>
     </message>
@@ -943,16 +1446,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -960,11 +1478,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
@@ -1059,22 +1592,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Auflegen</translation>
@@ -1233,67 +1817,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Dieses Gerät mit einem Ring-Konto verknüpfen</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,71 +1891,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Konto bestätigen</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Weiter</translation>
     </message>

translations/ring_client_windows_el.ts

diff --git a/translations/ring_client_windows_el.ts b/translations/ring_client_windows_el.ts
index 1362761..23285de 100644
--- a/translations/ring_client_windows_el.ts
+++ b/translations/ring_client_windows_el.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Περί</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Μονάδες</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation>Ρυθμίσεις</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Γενικά</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Λογαριασμός</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Τύπος</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Ψευδώνυμο</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Παράμετροι</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Όνομα χρήστη</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Σύνθημα</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Διαμεσολαβητής</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Αριθμός Voicemail</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Αυτόματη απάντηση κλήσεων</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP ενεργοποίηση</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>URL υπηρεσίας ονομάτων</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Αναπαραγωγή</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Ήχος/Βίντεο</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Για προχωρημένους</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Εγγραφή</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Χρονική λήξη καταχώρησης (δευτερόλεπτα):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Διεπαφή δικτύου</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Τα ίδια ως τοπικοί παράμετροι</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Καθορισμός δημοσιευμένης διεύθυνσης και θύρας:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Διεύθυνση</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Χρήση STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Χρήση TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Διαπραγμάτευση συνεδρίας SDP (εφεδρικό του ICE)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Εύρος θυρών RTP ήχου</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Ελάχιστο</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Μέγιστο</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Εύρος θυρών RTP βίντεο</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Ασφάλεια</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Συσκευές</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Προσθήκη συσκευής</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>Για προσθήκη νέας συσκευής στον Ring λογαριασμό σας, μπορείτε να εξάγετε τον λογαριασμό σας στο Ring. Αυτό θα δημιουργήσει ένα PIN το οποίο πρέπει να εισάγετε στην νέα σας συσκευή μέσα σε 5 λεπτά από την δημιουργία του.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Εξαγωγή στο Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Το δημιουργημένο σας PIN:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Δημοσιευμένη διεύθυνση</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>Πιστοποιητικό CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Πιστοποιητικό χρήστη</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Ιδιωτικό κλειδί</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Συνθηματικό ιδιωτικού κλειδιού</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Χρήση προκαθορισμένων αλγόριθμων κρυπτογράφησης</translation>
     </message>
@@ -428,12 +675,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Μεταφορά</translation>
     </message>
@@ -454,105 +726,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Συνομιλίες</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Αιτήματα επαφών</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Το Ring είναι ελεύθερο λογισμικό για παγκόσμια επικοινωνία που σέβεται τις ελευθερίες και την ιδιωτικότητα των χρηστών του.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Αυτό είναι το RingID σου.
 Αντέγραψε το και μοιράσου το με τους φίλους σου!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Προσθήκη στις επαφές</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Καλεί</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Κλήση</translation>
     </message>
@@ -645,6 +959,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -652,167 +974,283 @@
         <translation>Ρυθμίσεις</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Γενικά</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Ρυθμίσεις ιστορικού</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Βίντεο</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Προφίλ</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Συσκευή</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Εισαγωγή</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Εξαγωγή</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Λογαριασμός</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Νέος λογαριασμός</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -826,26 +1264,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Αναζήτηση...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Δημιουργία νέας επαφής</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Νέα επαφή</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Εισάγετε ένα όνομα εδώ...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Δημιουργία</translation>
     </message>
@@ -873,17 +1336,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Αποδοχή</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Μπλοκάρισμα</translation>
     </message>
@@ -895,6 +1373,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -920,11 +1413,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Εντάξει</translation>
     </message>
@@ -943,16 +1446,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Διαγραφή</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -960,11 +1478,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Αντιγραφή</translation>
@@ -1058,22 +1591,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Λήψη φωτογραφίας</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Εισαγωγή</translation>
     </message>
@@ -1105,12 +1643,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1166,36 +1740,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1232,67 +1816,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Άγνωστος</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Σύνδεση αυτής της συσκευής με ένα λογαριασμό</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,71 +1890,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Συνθηματικό</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Γίνεται δημιουργία του λογαριασμού σας Ring...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Προηγούμενο</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Επόμενο</translation>
     </message>

translations/ring_client_windows_en_GB.ts

diff --git a/translations/ring_client_windows_en_GB.ts b/translations/ring_client_windows_en_GB.ts
index e974544..3c86986 100644
--- a/translations/ring_client_windows_en_GB.ts
+++ b/translations/ring_client_windows_en_GB.ts
@@ -1,47 +1,59 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="en_GB" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="en_GB">
 <context>
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <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="30"/>
         <source>version</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="71"/>
         <source>Artwork by:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="75"/>
         <source>Based on the SFLPhone project</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -49,93 +61,118 @@
     <message>
         <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -143,281 +180,493 @@
         <location filename="../accountdetails.cpp" line="386"/>
         <location filename="../accountdetails.cpp" line="391"/>
         <source>Register on blockchain</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Play</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2267"/>
-        <source>Password (required)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2295"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2321"/>
-        <source>Export on the Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2373"/>
-        <source>Your generated pin:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2386"/>
-        <source>PIN</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
+        <source>Password (required)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
+        <source>Export on the Ring</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2514"/>
+        <source>Your generated pin:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
+        <source>PIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1313"/>
+        <source>Published Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2072"/>
+        <source>CA certificate</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1247"/>
-        <source>Published Address</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1961"/>
-        <source>CA certificate</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.cpp" line="101"/>
         <source>RingID</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.cpp" line="304"/>
         <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.cpp" line="323"/>
         <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.cpp" line="327"/>
         <source>Wrong password.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.cpp" line="354"/>
         <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -425,222 +674,297 @@
     <message>
         <location filename="../bannedcontactswidget.ui" line="20"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
+        <source>or type number...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="295"/>
         <source>Copy number</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="959"/>
         <source>Contact me on Ring</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="959"/>
         <source>My RingId is : </source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="214"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="227"/>
         <source>Display date</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="232"/>
         <source>Display author</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="263"/>
         <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="301"/>
         <source>Copy name</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="307"/>
         <source>Call Number</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="308"/>
         <source>Copy Number</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="311"/>
         <source>Copy %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="316"/>
         <source>Call %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="338"/>
         <source>Remove from contacts</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="762"/>
         <source>NO RING ACCOUNT FOUND</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="807"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="812"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="445"/>
         <source>Call incoming from %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -648,172 +972,288 @@
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -821,32 +1261,57 @@
     <message>
         <location filename="../contactpicker.ui" line="33"/>
         <source>Existing Contact</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -854,37 +1319,52 @@
     <message>
         <location filename="../contactrequestwidget.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../contactrequestwidget.ui" line="28"/>
         <source>Incoming Contact Request</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../contactrequestwidget.ui" line="87"/>
         <source>nameLabel</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../contactrequestwidget.ui" line="103"/>
         <source>bestIdLabel</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -892,7 +1372,22 @@
     <message>
         <location filename="../currentaccountwidget.ui" line="26"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -900,32 +1395,42 @@
     <message>
         <location filename="../deleteaccountdialog.ui" line="14"/>
         <source>Ring - account deletion</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="33"/>
         <source>Do you really want to delete account ?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="66"/>
         <source>This action is irrevocable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="73"/>
         <source>If this account hasn&apos;t been exported, or added to another device, it will be lost</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -933,50 +1438,80 @@
     <message>
         <location filename="../deletecontactdialog.ui" line="20"/>
         <source>Dialog</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="47"/>
         <source>Do you want to delete this contact?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="50"/>
         <source>Display date</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="54"/>
         <source>Display author</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -984,22 +1519,22 @@
     <message>
         <location filename="../mainwindow.ui" line="435"/>
         <source>Ring</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="59"/>
         <source>Configuration</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="62"/>
         <source>Exit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="81"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1007,38 +1542,38 @@
     <message>
         <location filename="../pathpassworddialog.ui" line="26"/>
         <source>Path</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="46"/>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="65"/>
         <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="72"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="60"/>
         <source>Save File</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="62"/>
         <location filename="../pathpassworddialog.cpp" line="67"/>
         <source>Ring archive files (*.ring)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="65"/>
         <source>Open File</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1046,7 +1581,7 @@
     <message>
         <location filename="../photoboothdialog.ui" line="14"/>
         <source>Photobooth</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1054,37 +1589,42 @@
     <message>
         <location filename="../photoboothwidget.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
-        <source>Import photo</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../photoboothwidget.ui" line="84"/>
+        <source>Import photo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../photoboothwidget.cpp" line="66"/>
         <source>Choose File</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../photoboothwidget.cpp" line="68"/>
         <source>Files (*)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1092,21 +1632,57 @@
     <message>
         <location filename="../utils.cpp" line="187"/>
         <source>No default mail client found</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="35"/>
         <source>Ring account</source>
         <comment>Default alias for new Ring account</comment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1114,22 +1690,22 @@
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="26"/>
         <source>ContactID</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="39"/>
         <source>TODO: Explain the purpose of a contact request</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="78"/>
         <source>Send contact request</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1137,72 +1713,82 @@
     <message>
         <location filename="../videooverlay.ui" line="42"/>
         <source>Call on Hold</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="119"/>
         <source>Hold / Unhold</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="154"/>
         <source>Chat</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="186"/>
         <source>Add person to call</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="218"/>
         <source>Transfer call</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="256"/>
         <source>Mute Mic</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="565"/>
-        <source>Time elapsed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="568"/>
+        <source>Time elapsed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="297"/>
         <source>Mute Video</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1210,17 +1796,17 @@
     <message>
         <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1228,150 +1814,285 @@
     <message>
         <location filename="../wizarddialog.cpp" line="69"/>
         <source>Your account needs to be migrated. Enter your password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
-        <source>Migrating your Ring account...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="127"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="460"/>
+        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="466"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
-</TS>
\ No newline at end of file
+</TS>

translations/ring_client_windows_eo.ts

diff --git a/translations/ring_client_windows_eo.ts b/translations/ring_client_windows_eo.ts
index 82122bd..6c50030 100644
--- a/translations/ring_client_windows_eo.ts
+++ b/translations/ring_client_windows_eo.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Pri</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Kredito</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>La Microsoft Windows kliento por Ring.
@@ -53,90 +63,115 @@
         <translation>Agordoj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Ĝenerala</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Kromnomo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parametroj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Nomo de gastiga komputilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Uzantnomo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Pasvorto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Prokura servilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Parolita mesaĝo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Aŭtomate respondi vokojn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP ŝaltita</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Permesi Vokojn de Nekonataj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Permesi Vokojn de Kontaktoj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Permesi Vokojn de Historio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>URL de noma servo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Agordoj de Ring Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Elekto de vokosono</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Ludi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Aŭdio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Sonkodekoj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Videokodekoj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Speciala</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Registriĝo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Tempolimo de registriĝo (sekunde):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Reta Interfaco</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Loka Pordo:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Same kiel lokaj parametroj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Agordi publikan adreson kaj pordon:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Adreso</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Pordo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Uzi STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>URL de servilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Uzi TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Regno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Intertraktado de SDP seanco (ICE retropaŝo)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Tiuj ĉi agordoj estas uzataj nur dum intertraktado de SDP seanco, se ICE ne estas subtenata de la servilo aŭ samtavolano.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Porda Amplekso de Aŭdia RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Maks</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Porda Amplekso de Videa RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Sekurigo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Aŭdvidflua ĉifrado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Aparatoj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Aldoni aparaton</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>Por aldoni novan aparaton al via Ring konto, vi elportu vian konton sur Ring. Vi akiros PIN kodon, kiun vi devos enigi en vian novan aparaton dum 5 minutoj.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Rezigni</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Elporti sur Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Via generita PIN:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>Okej</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Ĉifri aŭdvidfluon (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Publikita Adreso</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>CA atestilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Uzanta atestilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Privata ŝlosilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Pasvorto de privata ŝlosilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Uzi defaŭltajn ĉifrojn</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>aŭ tajpu numeron...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Transigi</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Serĉu kontaktojn aŭ entajpu Ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Konversacioj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>Menuo de agordoj</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring estas libera programo por universala komunikado, kiu respektas liberon kaj privatecon de siaj uzantoj.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Kunhavu vian Ring ID</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Tio ĉi estas via RingID.
 Kopiu kaj kunhavigu ĝin kun viaj amikoj!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Eraro dum generado de QR Kodo</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Aldoni al kontaktoj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Komencu la konversacion !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>Sendi mesaĝon</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Volas paroli kun vi!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Respondi</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Malatenti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Vokanta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Rezigni</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Voki</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Agordoj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Ĝenerala</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>Eliri el menuo de agordoj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Historiaj agordoj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Savu historion dum (tagoj)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Agordu 0 por senlima historio)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Vakigi Historion</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Diversaj Agordoj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Ne ĉesu pro fermado fenestron</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profilo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Nomo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Agordoj de Registrado</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Konservi en :</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Ĉiam registri</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Aŭtomate kontroli ĝisdatigojn po</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>tagoj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Aspekto nehavebla dum voko</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Selekto de Aparato</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Aparato</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Distingivo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Eliga aparato</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Eniga aparato</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>Aldoni novan konton</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Enporti</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Elporti</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Lanĉi Ring Post Startigo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Nova Konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Ĉu vi certe volas vakigi vian tutan historion?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Elektu dosierujon</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Eraro okazis dum enportado de konto.</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Serĉu...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Krei novan kontakton</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Nova Kontakto</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Entajpu nomon tie ĉi...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Krei</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Akcepti</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>Form</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Rezigni</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Okej</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Rezigni</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Forigi</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Sendi tekstmesaĝon...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Kopii</translation>
@@ -1059,22 +1592,27 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Foti</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>aŭ</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Enporti</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Aŭtomata</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Selentigi Mikrofonon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Kvalito</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Kunligi Vokojn</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Noma etikedo</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Aldoni al kontakto</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Pasinta tempo</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Fini Vokon</translation>
@@ -1233,67 +1817,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Nekonata</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,71 +1891,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Elektu vian uzantnomon</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Pasvorto</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Konfirmu pasvorton</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Generanta vian Ring-an konton...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Antaŭa</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Sekva</translation>
     </message>

translations/ring_client_windows_es.ts

diff --git a/translations/ring_client_windows_es.ts b/translations/ring_client_windows_es.ts
index 3feb382..934baab 100644
--- a/translations/ring_client_windows_es.ts
+++ b/translations/ring_client_windows_es.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Créditos</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>Libertad, igualdad y fraternidad. Versión 1.0</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>El cliente Ring para Microsoft Windows
@@ -53,90 +63,115 @@
         <translation>Configuración</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Cuenta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Escribe</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Alias</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parámetros</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Nombre del host</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Nombre de usuario</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Numero de Casilla de Mensaje</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Respuesta automática de llamadas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP habilitado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Permitir llamadas desconocidas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Permitir llamadas de Contactos</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Permitir llamada desde el Historial</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>Usuario público</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation>Registrarse en blockchain</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>URL del servicio de nombres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Configuración de la cuenta Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Selección de tono de llamada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Códecs de audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Códecs de video </translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Registro</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Tiempo de espera de Registración (seg):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Interface de Red</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Puerto Local:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Igual que los parametros locales</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Configurar dirección publicada y puerto:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Puerto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Utilizar STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>URL del Servidor</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Utilizar TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Dominio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Negociación de sesión SDP (Retorna a ICE)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Estas configuraciones solo se usan durante una negociación de una sesión SDP en caso de que ICE no sea soportado por el servidor o el compañero</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Rango de Puertos RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Mínimo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Máximo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Rango de Puertos RTP de Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Seguridad</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Cifrado del flujo audiovisual (SRPT)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Dispositivos</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Agregar dispositivo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>Para agregar un dispositivo a tu cuenta se exportará la misma en Ring. Esto producirá un PIN que debes escribir en el nuevo dispositivo antes de que pasen 5 minutos.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>Contraseña (obligatoria)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Exportar en Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>PIN generado:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation>El pin se debe introducir en su nuevo dispositivo en 5 minutos. Puede generar uno nuevo en cualquier momento.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>Contactos bloqueados</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Encriptar transmisión (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Dirección IP Publicada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>Certificado CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Certificado de usuario</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Clave privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Contraseña de clave privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Usar cifrados por defecto</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>ID bloqueado</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>Desbloquear contacto, y añadirle a la lista de contactos</translation>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>o escribe el número...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Transferir</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Buscar contacto o introducir número</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Conversaciones</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Solicitudes de contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>Menú de configuraciones</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring es software libre de comunicaciones que respeta las libertades y privacidad de sus usuarios.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Compartir el ID de Ring</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Este es tu RingID.
 ¡Cópialo y compártelo con tus amigos!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>Doble click para copiar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Hubo un error al generar el código QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Añadir a contactos</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>¡Comienza la conversación!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>Escribe tu mensaje aquí</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>enviar mensaje</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation>BestId</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>¡Quiere charlar contigo!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Contestar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Llamando</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Llamada</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Configuración</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>Cerrar menú de configuración</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Configuración del Historial</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Guardar Historial durante (días)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Dejar en 0 para historial ilimitado)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Limpiar historial</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Configuraciones Miscelaneas </translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Mantener minimizado al cerrar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>Buscar actualizaciones ahora</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Vídeo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Configuración de grabación</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Guardar en:</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Grabar siempre</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>Habilitar notificaciones</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Buscar actualizaciones automáticamente cada</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>dias</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Vista previa no disponible durante la llamada</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Seleccionar dispositivo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Resolución</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Dispositivo de salida</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Dispositivo de entrada</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>Aggregar cuenta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Importar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Exportar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Cuenta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Iniciar Ring automáticamente</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Nueva cuenta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>¿Estás seguro de que quieres limpiar todo el historial?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Elige directorio</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Hubo un error al importar la cuenta</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Buscar...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Crear un nuevo contacto</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Nuevo Contacto</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Introduce un nombre...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Crear</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation>bestIdLabel</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Aceptar</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation>Descartar</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Bloquear</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>Formulario</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Aceptar</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation>Eliminar y bloquear</translation>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Enviar mensaje de texto...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Copiar</translation>
@@ -1059,22 +1592,27 @@
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Sacar una foto</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>o</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation>Importar foto</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Importar</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Auto</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Silenciar micrófono</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Calidad</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Unirse a la llamada</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Etiqueta de nombre</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Agregar a Contactos</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Tiempo transcurrido</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Cortar</translation>
@@ -1233,67 +1817,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation>Migrando su cuenta de Ring...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation>Registrando su nombre de usuario, puede tardar unos minutos...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>Añadir un dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>Nombre de usuario no disponible.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>Nombre de usuario disponible.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>Nombre de usuario incorrecto.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>Error de red.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>Crear cuenta de Ring</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Conectar este dispositivo a una cuenta</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>Cómo agregar un dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation>Bienvenido(a) a</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1316,71 +1900,206 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Necesitará el PIN para completar el formulario. El PIN es válido por &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Crea tu perfil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation>Introduzca su nombre completo:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Crea tu cuenta</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Elije un nombre de usuario para ti</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>Buscando...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation>Registre su nombre de usuario en Ring. Esto reservará el nombre de usuario para que solo tú puedas usarlo. Sus amigos podrán llamarle con su nombre de usuario en lugar de usar su RingID.</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Registrar un nombre público (experimental)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>Escribe tu PIN</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Confirmar contraseña</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Generando tu cuenta Ring...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Siguiente</translation>
     </message>

translations/ring_client_windows_et_EE.ts

diff --git a/translations/ring_client_windows_et_EE.ts b/translations/ring_client_windows_et_EE.ts
index e19f067..973af1d 100644
--- a/translations/ring_client_windows_et_EE.ts
+++ b/translations/ring_client_windows_et_EE.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Mängi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -428,12 +675,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation type="unfinished"/>
     </message>
@@ -454,104 +726,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>vasta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Helistab</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation type="unfinished"/>
     </message>
@@ -644,6 +958,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -651,167 +973,283 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -825,26 +1263,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation type="unfinished"/>
     </message>
@@ -872,17 +1335,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -894,6 +1372,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -919,11 +1412,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"/>
     </message>
@@ -942,16 +1445,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -959,11 +1477,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation type="unfinished"/>
@@ -1057,22 +1590,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1104,12 +1642,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1165,36 +1739,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1231,67 +1815,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,71 +1889,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>

translations/ring_client_windows_fa_IR.ts

diff --git a/translations/ring_client_windows_fa_IR.ts b/translations/ring_client_windows_fa_IR.ts
index 818b26d..5123820 100644
--- a/translations/ring_client_windows_fa_IR.ts
+++ b/translations/ring_client_windows_fa_IR.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>درباره</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>دست‌اندرکاران</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>نسخه رینگ برای میکروسافت ویندوز
@@ -53,90 +63,115 @@
         <translation>تنظیمات</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>همگانی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>حساب کاربری</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>نوع</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>مستعار</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>پارامترها</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>نام هاست</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>نام کاربری</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>گذرواژه</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>پراکسی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>شماره پست صوتی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>پاسخگویی خودکار تماس‌ها</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP فعال شد</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>اجازه به مخاطبان برای تماس</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>نشانی اینترنتی خدمت نام</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>تنظیمات حساب رینگ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>ش</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>صدا/تصویر</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>پیشرفته</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>ثبت نام</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>رابط شبکه</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>درگاه محلی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>همانند پارامتر‌های محلی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>نشانی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>درگاه</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>از STUN استفاده کن</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>آدرس سرور</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>استفاده از TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>دامنهٔ درگاه RTP صدا</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>کمینه</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>بیشینه</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>امنیت</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>افزاره‌ها</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>افزودن دستگاه</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>لغو</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>خب</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>نشانی منتشر شده</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>گواهی CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>گواهی کاربر</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>کلید خصوصی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>گذرواژه کلید خصوصی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -429,12 +676,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>انتقال</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>درخواست‌های تماس</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>رینگ یک نرم‌افزار ارتباطات عمومی است که به آزادی‌ها و حریم شخصی کاربرانش احترام می‌گذارد.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>این آی‌دی رینگ شماست.
 کپی‌اش کنید و با دوستان‌تان به اشتراک بگذارید!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>افزودن به مخاطبان</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>ارسال پیام</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>پاسخ</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>رد</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>در حال تماس</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>لغو</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>تماس</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>تنظیمات</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>همگانی</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>پاک کردن تاریخچه</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>تصویر</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>نمایه</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>نام</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>روز</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>دستگاه</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>برون‌ریزی</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>حساب کاربری</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>حساب جدید</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>جستجو...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>مخاطب نو</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>ایجاد</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>قبول</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>مسدود</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>لغو</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>خب</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>لغو</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>حذف</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>کپی</translation>
@@ -1059,22 +1592,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1233,67 +1817,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>ناشناخته</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>پیوند این افزاره به یک حساب</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,71 +1891,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>نمایه خود را بسازید</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>حساب کاربری خود را بسازید</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>ثبت نام کاربری عمومی (آزمایشی)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>گذرواژه</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>تأیید گذرواژه</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>پیشین</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>بعدی</translation>
     </message>

translations/ring_client_windows_fi.ts

diff --git a/translations/ring_client_windows_fi.ts b/translations/ring_client_windows_fi.ts
index 420c6bb..12503ff 100644
--- a/translations/ring_client_windows_fi.ts
+++ b/translations/ring_client_windows_fi.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Tietoa</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Ring asiakasohjelma Microsoft Windowsille.
@@ -53,90 +63,115 @@
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Yleiset</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Tunnus</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Lempinimi</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parametrit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Yhteysosoite</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Käyttäjänimi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Salasana</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Välityspalvelin</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Vastaajan numero</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Automaattivastaus</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP päällä</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Salli puhelut tuntemattomilta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Salli puhelut yhteystiedolta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Salli puhelu historiasta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Ring tunnuksen asetukset</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Soittoäänen valinta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Toista</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Ääni/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Äänikoodekit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Videokoodekit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Edistyneet asetukset</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Rekistöröinti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Rekistöröinnin aikakatkaisu (sekunneissa):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Verkkoliitäntä</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Paikallinen portti:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Sama kuin paikalliset parametrit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Osoite</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Portti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Käytä STUNia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>Palvelimen osoite</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>RTP porttiväli</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Minimi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Maksimi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Video RTP porttiväli</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Turvallisuus</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Mediavirran salaus (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Peru</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Salaa mediavirta (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>CA sertifikaatti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Käyttäjäsertifikaatti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Henkilökohtainen salausavain</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Henkilökohtaisen salausavaimen salasana</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -429,12 +676,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>tai näppäile numero...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Lähetys</translation>
     </message>
@@ -455,104 +727,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Keskustelu</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>asetusvalikko</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Virhe generoidessa QR-koodia</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Lisää yhteystietoihin</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Aloita keskustelu!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>lähetä viesti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Haluaa puhua kanssasi!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Vastaa</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Sivuuta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Soittaa</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Peru</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Soita</translation>
     </message>
@@ -645,6 +959,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -652,167 +974,283 @@
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Yleiset</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Historian asetukset</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Säilytä historiassa (päivää)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(0 tarkoittaa rajoittamatonta historiaa)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Soittohistoria</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Mikrofoniasetukset</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Pidä pinennettynä suljettaessa</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profiili</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Tallenneasetukset</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Tarkista päivitykset automaattisesti joka</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>päivä</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Laitevalinta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Laite</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Tarkkuus</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>lisää uusi tunnus</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Tuo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Vie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Tunnus</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Uusi tunnus</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Oletko varma että haluat tyhjentää koko historiasi?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Valitse hakemisto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Virhe tunnuksen tuonnissa</translation>
     </message>
@@ -826,26 +1264,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Etsi...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Luo uusi yhteystieto</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Uusi yhteystieto</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Syötä nimi tähän...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Luo</translation>
     </message>
@@ -873,17 +1336,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Hyväksy</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -895,6 +1373,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -920,11 +1413,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Peru</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Vahvista</translation>
     </message>
@@ -943,16 +1446,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Peru</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Poista</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -960,11 +1478,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Lähetä tekstiviesti...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Kopioi</translation>
@@ -1058,22 +1591,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>tai</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Tuo</translation>
     </message>
@@ -1105,12 +1643,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Automaattinen</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1166,36 +1740,46 @@
         <translation>Mykistä mikki</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Laatu</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Liity puheluihin</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Nimikenttä</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Lisää yhteystietoon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Katkaisu</translation>
@@ -1232,67 +1816,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Tuntematon</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,71 +1890,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Valitse käyttäjänimesi</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Salasana</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Varmista salasana</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Seuraava</translation>
     </message>

translations/ring_client_windows_fr.ts

diff --git a/translations/ring_client_windows_fr.ts b/translations/ring_client_windows_fr.ts
index 50a61a3..4952b54 100644
--- a/translations/ring_client_windows_fr.ts
+++ b/translations/ring_client_windows_fr.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>À Propos</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Crédits</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>Liberté, Égalité, Fraternité! - Version 1.0</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Le client Windows de Ring
@@ -53,90 +63,115 @@
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Nom d&apos;emprunt</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Nom de machine</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Nom d&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Serveur mandataire</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Numéro de boîte vocale</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Répondre automatiquement</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP activé</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Autoriser les appels de personnes inconnues</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Autoriser les appels de vos contacts</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Autoriser les appels enregistrés dans l&apos;historique</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>Nom d’utilisateur</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation>Enregistrer sur la blockchain</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>URL du service de noms</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Paramètres Compte Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Choix de sonneries</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Lire</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Audio/Vidéo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Codecs audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Codecs vidéo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Options avancées</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Enregistrement</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <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="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Interface réseau</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Port local :</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Identique aux paramètres locaux</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <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="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Utiliser STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>URL du serveur</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Utiliser TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Domaine</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Négociation de session SDP (bascule sur ICE)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Plage des ports RTP audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Plage des ports RTP vidéo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Sécurité</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Chiffrement du flux média (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Appareils</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Ajouter un nouvel appareil</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>Pour ajouter un nouvel appareil à votre compte Ring, vous devez exporter votre compte sur le Ring. Cela génèrera un code PIN qui devra être saisi sur le nouvel appareil dans les 5 minutes suivant sa génération.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>Mot de passe (requis) :</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Exporter sur le Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Votre code PIN généré :</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>NIP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation>Ce NIP doit être saisi dans votre nouvel appareil dans les 5 prochaines minutes. Vous pouvez en générer un nouveau en tout temps.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>Contacts bannis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Chiffrer les flux média (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Adresse publiée</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>Certificat CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Certificat utilisateur</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Clé privée</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Mot de passe clé privée</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Utiliser les modes de chiffrements par défaut</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>Exclu</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>ou taper le numéro...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Transférer</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Rechercher dans les contacts ou entrer un ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Conversations</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Invitations</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>menu des paramètres</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring est un logiciel libre de communication universelle qui respecte les libertés et la vie privée de ses utilisateurs.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Partager votre ring id</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Voici votre RingID.
 Copiez-le et partagez-le avec vos amis !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>Double-cliquez pour copier</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Erreur pendant la génération du QR code</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Ajouter aux contacts</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Démarrer la conversation !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>Saisissez votre message ...</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>envoyer le message</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Veut parler avec vous !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Répondre</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Appel en cours</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Appel</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>quitter le menu des paramètres</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Paramètres de l&apos;historique</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Garder l&apos;historique pendant (jours)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <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="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Vider l&apos;historique</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Paramètres divers</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Laisser minimisé en fermant</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>Vérifier les mises-à-jour</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Vidéo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Enregistrer les paramètres</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Enregistrer sous :</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Toujours enregistrer</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>Activer les notifications</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Vérifier les mises-à-jour automatiquement tous les</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>jours</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Prévisualisation indisponible durant l&apos;appel</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Choix de caméra</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Périphérique</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Résolution</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Périphérique de sortie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Périphérique d’entrée</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>ajouter un nouveau compte</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Importer</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Exporter</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Compte</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Lancer Ring au démarrage</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Nouveau compte</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Êtes-vous certain de vouloir effacer l&apos;historique ?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Choisir un répertoire</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Une erreur est survenue pendant l&apos;import de compte.</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Rechercher...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Créer un nouveau contact</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Nouveau contact</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Entrer un nom ici...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Créer</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Accepter</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Bloquer</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation>Supprimer et bannir</translation>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Envoyer un message texte...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Copier</translation>
@@ -1059,22 +1592,27 @@
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Prendre une photo</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>ou</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation>Importer la photo</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Importer</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Auto</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Couper le micro</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Qualité</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Joindre des appels</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Étiquette de nom</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Ajouter aux contacts</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Temps écoulé</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Raccrocher</translation>
@@ -1233,67 +1817,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation>Migration de votre compte Ring…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation>Enregistrement du nom d&apos;utilisateur...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>Ajouter un appareil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>Nom d&apos;utilisateur indisponible</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>Nom d&apos;utilisateur disponible</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>Nom d&apos;utilisateur invalide</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>Erreur de réseau</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>Créer un compte Ring</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Lier cet appareil à un compte</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>Comment ajouter un appareil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation>Bienvenue sur</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,73 +1891,208 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Créer votre profil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation>Entrer votre nom complet :</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Créer votre compte</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Choisissez un nom d&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>Recherche de disponibilité...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation>Enregistre votre nom d&apos;utilisateur Ring.
 Ceci réserve ce nom de façon définitive et uniquement pour votre usage.
 Vos amis pourront vous appeler avec ce nom plutôt que votre RingID.</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Enregistrer un nom d&apos;utilisateur public (expérimental)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>Entrer votre code pin</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Confirmer le mot de passe</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Génération de votre compte Ring…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Précédent</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>

translations/ring_client_windows_fr_CA.ts

diff --git a/translations/ring_client_windows_fr_CA.ts b/translations/ring_client_windows_fr_CA.ts
index 9e14601..aae8e76 100644
--- a/translations/ring_client_windows_fr_CA.ts
+++ b/translations/ring_client_windows_fr_CA.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>À propos</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Crédits</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation>Réglages</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Alias</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Nom d&apos;hôte</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Nom d&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Numéro de boîte vocale</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Réponse-automatique aux appels</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Autoriser les appels d&apos;une source inconnue</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Autoriser les appels de vos contacts</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Paramètres du compte Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Sélection de sonneries</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Jouer</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Audio/Vidéo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Audio codecs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Vidéo codecs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Avancé</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Enregistrement</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Interface réseau</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Utiliser le TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Sécurité</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Appareils</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Adresse publiée</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
-        <translation type="unfinished"/>
+        <translation>clé privée</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -428,12 +675,22 @@
         <translation>Formulaire </translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>ou entrer le numéro</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Transfert</translation>
     </message>
@@ -454,104 +726,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Rechercher un contact ou entrer l&apos;identifiant Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Demandes de contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>Menu paramètres</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring est un logiciel libre de communication universel qui respecte la liberté et vie privée de ses utilisateurs.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Partager votre identifiant Ring</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Une erreur s&apos;est produite lors de la génération du code QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Ajouter aux contacts</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Débuter la conversation!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>envoyer le message</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Veut vous parler!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Réponse</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>appel en cours </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Appeler</translation>
     </message>
@@ -644,6 +958,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -651,167 +973,283 @@
         <translation>Réglages</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>Quitter le menu paramètres</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Paramètres de l&apos;historique</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Conserver l&apos;historique pour (nombre de jours)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Effacer l&apos;historique</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Vidéo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Paramètres d&apos;enregistrement</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Enregistrer sous:</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Enregistrer en tout temps</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Vérifier les mise à jour automatiquement tous les </translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>jours</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>L&apos;aperçu n&apos;est pas disponible pendant un appel</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Sélection de l&apos;appareil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Appareil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Résolution</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Périphérique de sortie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Périphérique d&apos;entrée</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>ajouter un nouveau compte</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Importation</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Exportation</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Compte</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Lancer Ring au démarrage</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Nouveau compte</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Êtes-vous certain de vouloir effacer tout l&apos;historique?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Choisir un répertoire</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Une erreur s&apos;est produite lors de l&apos;importation du compte</translation>
     </message>
@@ -825,26 +1263,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Recherche</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Créer un nouveau contact</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Nouveau contact</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Inscrire un nom ici</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Créer</translation>
     </message>
@@ -872,17 +1335,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Accepter</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Bloquer</translation>
     </message>
@@ -894,6 +1372,21 @@
         <source>Form</source>
         <translation>Formulaire </translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -919,11 +1412,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
@@ -942,16 +1445,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -959,11 +1477,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Envoyer un message texte</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Copier</translation>
@@ -1057,22 +1590,27 @@
         <translation>Formulaire </translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>ou</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Importation</translation>
     </message>
@@ -1104,12 +1642,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Auto</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1165,36 +1739,46 @@
         <translation>Couper le microphone</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Qualité</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Joindre l&apos;appel</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Nom de l&apos;étiquette</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Ajouter au contact</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Raccrocher</translation>
@@ -1231,67 +1815,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Associer cet appareil à un compte</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,71 +1889,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Créer votre profil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Enregistrer un nom d&apos;utilisateur public (expérimental)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>

translations/ring_client_windows_fr_FR.ts

diff --git a/translations/ring_client_windows_fr_FR.ts b/translations/ring_client_windows_fr_FR.ts
index fbb9080..3b0e0df 100644
--- a/translations/ring_client_windows_fr_FR.ts
+++ b/translations/ring_client_windows_fr_FR.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation>Réglages</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>mot de passe</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>ok</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -428,12 +675,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Transférer</translation>
     </message>
@@ -454,104 +726,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Ajouter dans les contacts</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Répondre</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Appel</translation>
     </message>
@@ -644,6 +958,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -651,167 +973,283 @@
         <translation>Réglages</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Vidéo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -825,26 +1263,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation type="unfinished"/>
     </message>
@@ -872,17 +1335,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Accepter</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -894,6 +1372,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -919,11 +1412,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"/>
     </message>
@@ -942,16 +1445,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -959,11 +1477,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Copier</translation>
@@ -1057,22 +1590,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1104,12 +1642,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1165,36 +1739,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1231,67 +1815,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,71 +1889,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>mot de passe</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>

translations/ring_client_windows_he.ts

diff --git a/translations/ring_client_windows_he.ts b/translations/ring_client_windows_he.ts
index dc63d8d..3e9b08f 100644
--- a/translations/ring_client_windows_he.ts
+++ b/translations/ring_client_windows_he.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>אודות</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>תודות</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>לקוח Microsoft Windows עבור Ring.
@@ -53,90 +63,115 @@
         <translation>הגדרות</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>כלליות</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>חשבון</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>טיפוס</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>כינוי</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>פרמטרים</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>שם מארח</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>שם משתמש</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>סיסמה</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>פרוקסי</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>מספר תא קולי</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP מאופשר</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>אודיו/וידאו</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>מתקדם</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>רישום</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>ממשק רשת</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>פורט מקומי:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>זהה לפרמטרים מקומיים</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>קבע כתובת ופורט מפורסמים:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>כתובת</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>פורט</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>URL שרת</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>תחום</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>מינימום</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>מקסימום</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>אבטחה</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>התקנים</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>ביטול</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>תעודת CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>תעודת משתמש</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>מפתח פרטי</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -429,12 +676,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>או הקלד מספר...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>העבר</translation>
     </message>
@@ -455,104 +727,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>דיונים</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>ביטול</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>קריאה</translation>
     </message>
@@ -645,6 +959,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -652,167 +974,283 @@
         <translation>הגדרות</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>כלליות</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>הגדרות היסטוריה</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>טהר היסטוריה</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>וידאו</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>פרופיל</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>שם</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>מכשיר</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>רזולוציה</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>חשבון</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>חשבון חדש</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>האם אתה בטוח כי ברצונך לטהר את ההיסטוריה שלך?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -826,26 +1264,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>חפש...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>צור איש קשר חדש</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>איש קשר חדש</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>הזן שם כאן...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>צור</translation>
     </message>
@@ -873,17 +1336,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>קבל</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -895,6 +1373,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -920,11 +1413,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>ביטול</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"/>
     </message>
@@ -943,16 +1446,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>ביטול</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>מחק</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -960,11 +1478,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>שלח הודעת טקסט...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>העתק</translation>
@@ -1058,22 +1591,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1105,12 +1643,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1166,36 +1740,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>הוסף לאיש קשר</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>נתק</translation>
@@ -1232,67 +1816,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>לא מוכר</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,71 +1890,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>סיסמה</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>כעת מפיק חשבון Ring שלך...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>קדימה</translation>
     </message>

translations/ring_client_windows_hi_IN.ts

diff --git a/translations/ring_client_windows_hi_IN.ts b/translations/ring_client_windows_hi_IN.ts
index ef11194..9c85548 100644
--- a/translations/ring_client_windows_hi_IN.ts
+++ b/translations/ring_client_windows_hi_IN.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>खाता</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>शुरू करें</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -428,12 +675,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation type="unfinished"/>
     </message>
@@ -454,104 +726,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>रिंग हर तरह के संवाद के लिये एक मुक्त/स्विधीन साॅफ्टवेयर है, जो अपने उपभोक्ताओं की स्वाधीनता व गोपनीयता का सम्मान करता है</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation type="unfinished"/>
     </message>
@@ -644,6 +958,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -651,167 +973,283 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>वीडियो</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>नाम</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>खाता</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -825,26 +1263,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation type="unfinished"/>
     </message>
@@ -872,17 +1335,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -894,6 +1372,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -919,11 +1412,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"/>
     </message>
@@ -942,16 +1445,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -959,11 +1477,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation type="unfinished"/>
@@ -1057,22 +1590,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1104,12 +1642,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1165,36 +1739,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1231,67 +1815,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,71 +1889,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>

translations/ring_client_windows_hr.ts

diff --git a/translations/ring_client_windows_hr.ts b/translations/ring_client_windows_hr.ts
index f79e126..8feb900 100644
--- a/translations/ring_client_windows_hr.ts
+++ b/translations/ring_client_windows_hr.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>O programu</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Zasluge</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation>Postavke</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Opće</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Račun</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Vrsta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Alias</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parametri</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Ime poslužitelja</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Korisničko ime</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Lozinka</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Broj govorne pošte</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Automatski primi pozive</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP omogućen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Postavke Ring računa</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Odabir melodije zvona</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>izvodi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Audio kodeci</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Video kodeci</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Napredno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Registracija</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Mrežno sučelje</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Lokalni port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Isto kao i lokalni parametri</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Adresa</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Koristi STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>URL poslužitelja</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Koristi TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Minimalno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Maksimalno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Sigurnost</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Poništi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>U redu</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Korisnički certifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Privatni ključ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Lozinka privatnog ključa</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -428,12 +675,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>ili utipkajte broj...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Prenesi</translation>
     </message>
@@ -454,104 +726,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Razgovori</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>izbornik postavki</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Podjelite vaš ring id</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Greška prilikom generiranja QR koda</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Dodaj u kontakte</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Započnite razgovor !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>pošaljite poruku</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Želi govoriti sa vama!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Javi se</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Ignoriraj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Zovem</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Poništi</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Nazovi</translation>
     </message>
@@ -644,6 +958,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -651,167 +973,283 @@
         <translation>Postavke</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Opće</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Postavke povijesti</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Zadrži povijest (dana)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Postavi na 0 za neograničenu povijest)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Očisti povijest</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Postavke snimanja</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Spremi u:</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Uvijek snimaj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Provjeri za ažuriranja svakih</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>dana</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Odabir uređaja</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Uređaj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Razlučivost</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Izlazni uređaj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Ulazni uređaj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>dodaj novi kontakt</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Uvezi</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Izvezi</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Račun</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Pokreni Ring pri paljenju računala</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Novi račun</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Jeste li sigurni da želite očistiti svu vašu povijest?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Izaberite direktorij</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -825,26 +1263,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Traži...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Napravi novi kontakt</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Novi kontakt</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Unesite ime ovdje...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Stvori</translation>
     </message>
@@ -872,17 +1335,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Prihvati</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Blokiraj</translation>
     </message>
@@ -894,6 +1372,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -919,11 +1412,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Poništi</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>U redu</translation>
     </message>
@@ -942,16 +1445,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Poništi</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -959,11 +1477,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Pošaljite tekstualnu poruku</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Kopiraj</translation>
@@ -1057,22 +1590,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>ili</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Uvezi</translation>
     </message>
@@ -1104,12 +1642,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1165,36 +1739,46 @@
         <translation>Isključi mikrofon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Kvalitet</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Dodaj u kontakt</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1231,67 +1815,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Nepoznato</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,71 +1889,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Napravite vaš profil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Napravite vaš račun</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Izaberite vaše korisničko ime</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Lozinka</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Potvrdi lozinku</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Slijedeće</translation>
     </message>

translations/ring_client_windows_hu.ts

diff --git a/translations/ring_client_windows_hu.ts b/translations/ring_client_windows_hu.ts
index 445298b..1e38d46 100644
--- a/translations/ring_client_windows_hu.ts
+++ b/translations/ring_client_windows_hu.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Névjegy</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Készítők</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>A Microsoft Windows kliens a Ringhez.
@@ -53,90 +63,115 @@
         <translation>Beállítások</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Általános</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Fiók</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Típus</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Álnév</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Paraméterek</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Kiszolgálónév</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Felhasználónév</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Jelszó</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Hangpostaszám</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Hívások automatikus fogadása</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP engedélyezve</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Hívások engedélyezése ismeretlenektől</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Hívások engedélyezése a partnerlista tagjaitól</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Hívások engedélyezése az előzményekben szereplőktől</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>Webcím névszolgáltatás</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Ringfiók beállításai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Csengőhang kiválasztása</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Lejátszás</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Hang/videó</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Hangcodekek</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Videócodekek</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Haladó</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Regisztáció</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Regisztráció érvényességének lejárta (másodpercekben):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Hálózati interfész</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Helyi port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Ugyanaz, mint a helyi paraméterek</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Nyilvános cím és port megadása:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Cím</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>STUN használata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>Szerver-URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>TURN használata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP munkamenet targyalás (az ICE tartaléka)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Ezek a beállítások csak az SDP munkamenet tárgyalásánál kerülnek használatra, ha a kiszolgáló vagy a partner nem támogatja az ICE-t</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Hang RTP port korlát</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Videó RTP port korlát</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Biztonság</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Média-adatfolyam titkosítása (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Eszközök</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Eszköz hozzáadása</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>Ahhoz hogy új eszközt adjon a Ring fiókjához, exportálnia kell a fiókját a Ringen. Ez előállít egy PIN-t, amit meg kell adnia az új eszközén, az előállítástól számított 5 percen belül.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Mé_gse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Exportálás a Ringen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>A generált PIN:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>Rendben</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Média-adatfolyam titkosítása (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Nyilvános cím</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>CA-engedély</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Felhasználói engedély</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Privátkulcs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Privátkulcs jelszava</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Alapértelmezett cipherek használata</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>vagy írjon be egy számot…</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Átvitel</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Partnerek keresése vagy Ringazonosító beírása</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Beszélgetések</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Partnerkérelmek</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>Beállítások menü</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>A Ring szabad szoftver az univerzális kommunikációhoz, amely tiszteletben tartja a felhasználók szabadságát és magánszféráját.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Ossza meg a Ringazonosítóját</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Ez az ön Ringazonosítója.
 Másolja ki és ossza meg a barátaival!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Hiba a QR kód generálása közben</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Hozzáadás a partnerekhez</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>A beszélgetés indítása!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>üzenet küldése</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Beszélni akar önnel!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Válaszol</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Figyelmen kívül hagy</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Hívás</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Beállítások</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Általános</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>kilépés a beállítások menüből</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Előzmények beállításai</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Előzmények megtartása ennyi napig</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Állítsa 0-ra a végtelen előzményekért)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Előzmények törlése</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Egyéb beállítások</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Bezáráskor legyen minimalizálva</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Videó</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Név</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Felvételbeállítások</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Mentési hely:</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Mindig legyen felvétel</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Frissítések ellenőrzése minden</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>nap</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Előnézet nem elérhető hívás közben</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Eszköz kiválasztása</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Eszköz</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Felbontás</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Kimeneti eszköz</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Bemeneti eszköz</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>új fiók hozzáadása</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Importálás</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Exportálás</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Fiók</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>A Ring indítása rendszerindításkor</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Új fiók</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Biztos, hogy törölni akarja az összes előzményt?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Könyvtár kiválasztása</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Hiba történt a fiók importálása közben.</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Keresés…</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Új partner létrehozása</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Új partner</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Név beírása ide…</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Létrehozás</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Elfogadás</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Blokkolás</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Mé_gse</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Mé_gse</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Törlés</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Szöveges üzenet küldése…</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Másolás</translation>
@@ -1059,22 +1592,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Fotó készítése</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>vagy</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Importálás</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Mikrofon elnémítása</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Minőség</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Hívások csatlakozása</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Névcímke</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Hozzáadás a partnerek listájához</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Eltelt idő</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Lerak</translation>
@@ -1233,67 +1817,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Ismeretlen</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Ezen eszköz fiókhoz kapcsolása</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,71 +1891,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Jelszó</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>A Ringfiókja létrehozása…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Vissza</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Következő</translation>
     </message>

translations/ring_client_windows_id.ts

diff --git a/translations/ring_client_windows_id.ts b/translations/ring_client_windows_id.ts
index 9eb8e3d..9513c3c 100644
--- a/translations/ring_client_windows_id.ts
+++ b/translations/ring_client_windows_id.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Akun</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -428,12 +675,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation type="unfinished"/>
     </message>
@@ -454,104 +726,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Tambah sebagai kontak</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation type="unfinished"/>
     </message>
@@ -644,6 +958,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -651,167 +973,283 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Nama</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Akun</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -825,26 +1263,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation type="unfinished"/>
     </message>
@@ -872,17 +1335,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Terima</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Blokir</translation>
     </message>
@@ -894,6 +1372,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -919,11 +1412,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"/>
     </message>
@@ -942,16 +1445,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -959,11 +1477,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation type="unfinished"/>
@@ -1057,22 +1590,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1104,12 +1642,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1165,36 +1739,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1231,67 +1815,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Tidak diketahui</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,71 +1889,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Selanjutnya</translation>
     </message>

translations/ring_client_windows_it.ts

diff --git a/translations/ring_client_windows_it.ts b/translations/ring_client_windows_it.ts
index 2b3609e..80d11cd 100644
--- a/translations/ring_client_windows_it.ts
+++ b/translations/ring_client_windows_it.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Crediti</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Profilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Alias</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parametri</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Nome Host</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Nome utente</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Numero di voicemail</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Risposta automatica alle chiamate</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP attivato</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Play</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Avanzato</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Registrazione</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Timeout di espirazione della registrazione (seconds):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Interfaccia di rete</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Identico alle impostazioni locali</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Digitare l&apos;indirizzo pubblicato e il porto:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Indirizzo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Usare STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Usare TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Negoziazione sessione SDP (sostituto a ICE)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Questi parametri sono usati unicamente durante la negoziazione di una sessione SDP nel caso in cui ICE non è sopportato dal server o peer.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Intervallo porti audio RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Massimo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Intervallo porti video RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Sicurezza</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Dispositivi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Indirizzo di publicazione</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>Certificato dell&apos;autorita</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Certificato utente</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Chiave privata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Password della chiave privata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Usare il cifrario di default</translation>
     </message>
@@ -428,12 +675,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Trasferimento</translation>
     </message>
@@ -454,105 +726,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Converzazioni</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Richieste di contatto</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring è un software libero per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Questo è il suo RingID.
 Da copiare e condividere con gli amici!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Aggiungi contatti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Chiamando</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Chiama</translation>
     </message>
@@ -645,6 +959,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -652,167 +974,283 @@
         <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Impostazioni storico</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profilo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Importare</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Esportare</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Profilo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Nuovo account</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -826,26 +1264,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Nuovo contatto</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Crea</translation>
     </message>
@@ -873,17 +1336,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Accettare</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Blocca</translation>
     </message>
@@ -895,6 +1373,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -920,11 +1413,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"/>
     </message>
@@ -943,16 +1446,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -960,11 +1478,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Copia</translation>
@@ -1058,22 +1591,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Scattare una foto</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Importare</translation>
     </message>
@@ -1105,12 +1643,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1166,36 +1740,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Riattacare</translation>
@@ -1232,67 +1816,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,71 +1890,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Confermare password</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Generazione del account Ring in corso…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Seguente</translation>
     </message>

translations/ring_client_windows_it_IT.ts

diff --git a/translations/ring_client_windows_it_IT.ts b/translations/ring_client_windows_it_IT.ts
index 3509104..5a31d31 100644
--- a/translations/ring_client_windows_it_IT.ts
+++ b/translations/ring_client_windows_it_IT.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Crediti</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Client Ring per Microsoft Windows.
@@ -53,90 +63,115 @@
         <translation>Opzioni</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Utente</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Alias</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parametri</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Utente</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Numero voicemail</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Risposta automatica alle chiamate</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP abilitato</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Permetti chiamate da sconosciuti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Permetti chiamate dai contatti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Permetti chiamate dalla cronologia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>URL del servizio di nomi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Opzioni dell&apos;account Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Seleziona suoneria</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Avvia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Codec audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Codec video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Avanzato</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Registrazione</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Scadenza timeout di registrazione (secondi):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Interfaccia di rete</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Porta locale</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Uguale ai parametri locali</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Imposta l&apos;indirizzo pubblicato e la porta:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Indirizzo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Utilizza STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>URL del server</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Utilizza TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Realm</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Negoziazione sessione SDP (usa ICE in caso contrario)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Queste impostazioni vengono utizzate solo durante la negoziazione della sessione SDP nel caso in cui ICE non sia supportato dal server o dal peer.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Intervallo porte audio RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Intervallo porte video RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Sicurezza</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Crittografia Media Stream (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Dispositivi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Aggiungi dispositivo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>Per aggiungere un nuovo dispositivo al tuo account Ring, esporta il tuo account su Ring. Questo genererà un pin che deve essere immesso sul tuo nuovo dispositivo entro 5 minuti dalla sua generazione.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Esporta su Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Il pin generato per te:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Cifra lo stream media (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Indirizzo Pubblico</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>Certificato CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Certificato Utente</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Chiave Privata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Password Chiave Privata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Usa il cifrario di default</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Modulo</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>O scrivi un numero...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Trasferisci</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Cerca un contatto o inserisci il suo Ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Conversazioni</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Richiesta di contatto</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>Menù Impostazioni</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring è software libero per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Condividi il tuo Ring ID</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Questo è il tuo RingID.
 Copialo e condividilo con i tuoi amici!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Errore durante la generazione del Codice QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Aggiungi alla rubrica</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Inizia la conversazione!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>Invia Messaggio</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Vuole parlare con te!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Rispondi</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Ignora</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Sta chiamando</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Chiamata</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Opzioni</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>Esci dalle impostazioni</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Impostazioni Cronologia</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Mantieni la cronologia per (Giorni)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(0 per cronologia illimitata)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Cancella cronologia</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Impostazioni Varie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Minimizza alla chiusura</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profilo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Controlla aggiornamenti</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Salva in:</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Registra Sempre</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Cerca aggiornamenti ogni</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>giorni</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Anteprima non disponibile durante la chiamata</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Seleziona Dispositivo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Risoluzione</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Dispositivo di Uscita</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Dispositivo di Ingresso</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>aggiungi un nuovo account</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Importa</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Esporta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Account</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Esegui Ring all&apos;avvio</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Nuovo Account</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Sei sicuro di voler cancellare tutta la cronologia?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Scegli Cartella</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Un errore è occorso durante l&apos;importazione dell&apos;account.</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Cerca...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Crea un nuovo contatto</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Nuovo Contatto</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Inserisci un nome qui...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Crea</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Accetta</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Blocca</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>Modulo</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Invia un messaggio di testo...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Copia</translation>
@@ -1059,22 +1592,27 @@
         <translation>Modulo</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Scatta una foto</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>oppure</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Importa</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Auto</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Mutati</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Qualità</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Entra in chiamata</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Etichetta Nome</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Aggiungi ai contatti</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Tempo trascorso</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Aggancia</translation>
@@ -1233,67 +1817,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Collega questo dispositivo ad un account</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,71 +1891,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Crea il tuo profilo</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Crea il tuo account</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Registra un nome utente pubblico (sperimentale)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Conferma password</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Generazione del tuo account Ring...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Precedente</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Prossimo</translation>
     </message>

translations/ring_client_windows_ja.ts

diff --git a/translations/ring_client_windows_ja.ts b/translations/ring_client_windows_ja.ts
index 12ec5b9..d971894 100644
--- a/translations/ring_client_windows_ja.ts
+++ b/translations/ring_client_windows_ja.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>クレジット</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>全般</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>アカウント</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>種類</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>別名</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>パラメーター</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>ホスト名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>ユーザー名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>パスワード</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>プロキシ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>ボイスメール番号</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>自動応答呼び出し</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP 有効</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>名前サービス URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>再生</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>音声/動画</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>詳細</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>登録</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>ネットワークインターフェイス</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>ローカルパラメーターと同じ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>アドレス</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>ポート番号</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>TURNを使用</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>音声 RTP ポートの範囲</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>最小</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>最大</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>セキュリティ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>端末</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>発行されたアドレス</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>プライベートキー</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -428,12 +675,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>転送</translation>
     </message>
@@ -454,105 +726,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>会話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>連絡先のリクエスト</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring は、ユーザーの自由とプライバシーを尊重する普遍的なコミュニケーションのためのフリーソフトウェアです。</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>これがあなたのRingIDです。
 コピーして友達とシェアしましょう！</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>連絡先に追加</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>応答</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>無視</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>発信中</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>通話</translation>
     </message>
@@ -645,6 +959,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -652,167 +974,283 @@
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>全般</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>履歴の設定</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>履歴を消去</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>ビデオ</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>プロフィール</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>名前</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>日</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>端末</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>エクスポート</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>アカウント</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>新規アカウント</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -826,26 +1264,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation type="unfinished"/>
     </message>
@@ -873,17 +1336,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>受け入れ</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>ブロック</translation>
     </message>
@@ -895,6 +1373,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -920,11 +1413,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
@@ -943,16 +1446,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>削除</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -960,11 +1478,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>コピー</translation>
@@ -1058,22 +1591,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1105,12 +1643,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1166,36 +1740,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>受話</translation>
@@ -1232,67 +1816,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>不明</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>このデバイスをアカウントへリンク</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,71 +1890,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>プロフィールを作成</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>公開ユーザー名を登録 (実験的)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>パスワード</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>パスワードの再入力</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>次へ</translation>
     </message>

translations/ring_client_windows_ko_KR.ts

diff --git a/translations/ring_client_windows_ko_KR.ts b/translations/ring_client_windows_ko_KR.ts
index df8cdf7..bfc9a1f 100644
--- a/translations/ring_client_windows_ko_KR.ts
+++ b/translations/ring_client_windows_ko_KR.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>마이크로소프트 윈도우즈용 Ring 클라이언트.
@@ -53,90 +63,115 @@
         <translation>설정</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>일반</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>계정</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>유형</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>별칭</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>인자들</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>호스트명</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>사용자명</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>암호</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>프록시</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>음성메일 번호</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>자동 응답 횟수</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP 가능여부</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>모르는 사람과 통화 허용</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>연락처 등록된 사람과 통화 허용</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>통화이력으로부터 통화 허용</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>공개 사용자명</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation>블록체인에 등록</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>네임 서비스 URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Ring 계정 설정</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>통화음 선택</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>재생</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>오디오/비디오</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>오디오 코덱</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>비디오 코덱</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>등록</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>등록 유효 시간(초):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>네트워크 인터페이스</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>공개 주소와 포트 설정하기</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>주소</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>포트</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>STUN 사용</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>서버 URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>TURN 사용</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>최소</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>최대</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>비디오 RTP 포트 범위</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>보안</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>미디어 스트림 암호화 (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>장치</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>장치 추가하기</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>암호 (필수)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>취소</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation>이 PIN 번호는 5분 안에 새로운 장비에 입력해야 합니다. 언제든지 새로운 번호를 다시 생성할 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>차단한 연락처</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>공개 주소</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>개인키</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>개인키 암호</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>기본 ciphers 사용하기</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>서식</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>차단한 ID</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>차단 해제 후 연락처 목록에 추가</translation>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>혹은 번호를 입력하세요...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>보내기</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>연락처나 ring ID를 입력하여 찾기</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>대화</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>설정 메뉴</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>ring id 공유하기</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>이것이 당신의 RingID입니다.
 복사 후 당신의 친구들에게 공유하세요!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>더블클릭으로 복사하기</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>QR 생성 중 오류</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>연락처에 추가하기</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>대화를 시작합니다!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>여기에 메시지를 입력하세요</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>메시지 보내기</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>당신과 이야기하고 싶어합니다!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>응답</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>무시</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>통화 중</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>취소</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>통화</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>설정</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>일반</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>이력 설정</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>이력 삭제</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>기타 설정</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>닫을 때 최소화 유지하기</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>지금 업데이트 확인하기</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>비디오</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>프로필</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>이름</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>녹화 설정</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>항상 녹화하기</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>알람 사용하기</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>매번 자동 업데이트 확인</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>일</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>장치 선택</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>장치</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>해상도</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>출력 장치</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>입력 장치</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>새 계정 추가하기</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>가져오기</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>내보내기</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>계정</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>시작 시 Ring 실행</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>새 계정</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>디렉토리 선택</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>계정 가져오기 중 오류가 발생하였습니다.</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>찾기...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>새 연락처 추가</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>새 연락처</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>여기에 이름을 입력하세요...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>생성하기</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>수락</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>서식</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>취소</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>확인</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>취소</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation>삭제하고 차단하기</translation>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>텍스트 메시지 보내기...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>복사하기</translation>
@@ -1059,22 +1592,27 @@
         <translation>서식</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>사진 찍기</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>또는</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation>사진 가져오기</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>가져오기</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>자동</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>마이크 끄기</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>품질</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>통화에 참여하기</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>연락처에 추가</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>경과한 시간</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>통화종료</translation>
@@ -1233,67 +1817,67 @@
         <translation>당신의 계정은 이전이 필요합니다. 암호를 입력하세요.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation>당신의 Ring 계정을 이전 중입니다.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation>당신의 공개 사용자명을 등록 중입니다. 잠시만 기다리세요.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>장치 추가하기</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>사용할 수 없는 사용자명입니다.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>사용 가능한 사용자명입니다.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>올바르지 않은 사용자명입니다.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>네트워크 오류</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>Ring 계정 생성</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>이 장치를 계정에 연결하기</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>장치를 추가하는 법</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation>환영합니다</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,71 +1891,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>프로필 만들기</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation>풀 네임을 입력하세요:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>계정 생성하기</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>사용자명 선택</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>검색 중...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation>Ring에서 사용할 사용자명을 등록하세요. 이는 당신만 사용할 수 있는 사용자 명입니다. 당신의 친구가 RingID를 사용하는 것 대신 사용자 이름으로 연결할 수 있습니다.</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>공개 사용자명을 등록하세요 (실험중)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>PIN 번호를 입력하세요.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>암호</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>암호 확인</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Ring 계정 생성 중...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>이전</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>다음</translation>
     </message>

translations/ring_client_windows_lt.ts

diff --git a/translations/ring_client_windows_lt.ts b/translations/ring_client_windows_lt.ts
index 6528c92..9f1026b 100644
--- a/translations/ring_client_windows_lt.ts
+++ b/translations/ring_client_windows_lt.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Apie</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Padėkos</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>Liberté, Égalité, Fraternité - Versija 1.0</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Microsoft Windows kliento programa, skirta Ring.
@@ -53,90 +63,115 @@
         <translation>Nustatymai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Bendra</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Paskyra</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Tipas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Slapyvardis</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parametrai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Kompiuterio vardas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Naudotojo vardas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Slaptažodis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Įgaliotasis serveris</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Balso pašto numeris</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Automatiškai atsiliepti į skambučius</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP įjungta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Leisti skambučius nuo nepažįstamųjų</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Leisti skambučius nuo kontaktų</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Leisti skambučius iš istorijos</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>Viešasis naudotojo vardas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation>Registruoti blokų grandinėje</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>Vardų paslaugos URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Ring paskyros nustatymai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Skambučio melodijos pasirinkimas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Groti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Garsas/Vaizdas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Garso kodekai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Vaizdo kodekai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Išplėstiniai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Registracija</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Registracijos galiojimo pabaigos laiko limitas (sekundžių):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Tinklo sąsaja</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Vietinis prievadas:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Toks pats kaip vietiniai parametrai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Nustatyti paskelbtą adresą ir prievadą:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Adresas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Prievadas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Naudoti STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>Serverio URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Naudoti TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Sritis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP seanso derėjimasis (ICE surogatas)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Šie nustatymai yra naudojami tik SDP seanso derėjimosi metu tuo atveju, jei serveris arba naudotojas nepalaiko ICE.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Garso RTP prievadų rėžis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Maž.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Didž.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Vaizdo RTP prievadų rėžis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Saugumas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Medija srauto šifravimas (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Įrenginiai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Pridėti įrenginį</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>Norėdami pridėti naują įrenginį į savo Ring paskyrą, jūs eksportuojate savo paskyrą Ring sistemoje. Tai sukurs pin, kurį per 5 minutes nuo jo sukūrimo reikės įvesti jūsų naujame įrenginyje.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>Slaptažodis (būtinas)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Atsisakyti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Eksportuoti Ring sistemoje</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Jūsų sukurtas pin:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation>Šis PIN per 5 minutes turėtų būti įvestas jūsų naujame įrenginyje. Naują PIN galite sukurti bet kuriuo metu.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>Gerai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>Užblokuoti kontaktai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Šifruoti medija srautą (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Paskelbtas adresas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>LĮ liudijimas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Naudotojo liudijimas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Privatusis raktas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Privačiojo rakto slaptažodis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Naudoti numatytuosius šifrus</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>Atblokuoti kontaktą ir pridėti į kontaktų sąrašą</translation>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>arba įrašykite numerį...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation type="unfinished"/>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Ieškokite kontaktus arba įrašykite ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Pokalbiai</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Kontakto užklausos</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>nustatymų meniu</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring yra visuotiniam susisiekimui skirta laisva programinė įranga, kuri gerbia savo naudotojų laisves ir privatumą.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Dalintis savo ring id</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Tai yra jūsų RingID.
 Nukopijuokite ir dalinkitės juo su savo draugais!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>Spustelėkite du kartus, norėdami nukopijuoti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Klaida, kuriant QR kodą</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Pridėti prie kontaktų</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Pradėkite pokalbį !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>Čia rašykite savo žinutę</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>siųsti žinutę</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Nori su jumis pakalbėti!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Atsiliepti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Nepaisyti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Skambinama</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Atsisakyti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Skambutis</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Nustatymai</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Bendra</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>išeiti iš nustatymų meniu</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Istorijos nustatymai</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Laikyti istoriją (dienų)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Nustatykite 0 neribotai istorijai)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Išvalyti istoriją</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Įvairūs nustatymai</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Užvėrus, palikti suskleistą</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>Tikrinti dabar ar yra atnaujinimų</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Vaizdas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profilis</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Vardas</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Įrašymo nustatymai</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Įrašyti į :</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Visada įrašinėti</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>Įjungti pranešimus</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Tikrinti ar yra atnaujinimų kas</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>dienas</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Skambučio metu, peržiūra neprieinama</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Įrenginio pasirinkimas</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Įrenginys</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Raiška</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Išvesties įrenginys</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Įvesties įrenginys</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>pridėti naują paskyrą</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Importuoti</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Eksportuoti</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Paskyra</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Paleisti Ring, įjungus kompiuterį</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Nauja paskyra</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Ar tikrai norite išvalyti visą savo istoriją?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Pasirinkti katalogą</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Importuojant paskyrą, įvyko klaida.</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Paieška...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Sukurti naują kontaktą</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Naujas Kontaktas</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Čia įrašykite vardą...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Kurti</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Priimti</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation>Atmesti</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Užblokuoti</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>Forma</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Atsisakyti</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Gerai</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Atsisakyti</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Ištrinti</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation>Ištrinti ir užblokuoti</translation>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Siųsti teksto žinutę...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Kopijuoti</translation>
@@ -1059,22 +1592,27 @@
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Padaryti nuotrauką</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>arba</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation>Importuoti nuotrauką</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Importuoti</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Automatinė</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Išjungti mikrofoną</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Kokybė</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Vardo etiketė</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Pridėti prie kontaktų</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Praėjęs laikas</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Padėti ragelį</translation>
@@ -1233,67 +1817,67 @@
         <translation>Jūsų paskyra turi būti perkelta. Įveskite savo slaptažodį.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation>Perkeliama jūsų Ring paskyra...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Nežinoma</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation>Registruojamas jūsų viešasis naudotojo vardas, tai gali užtrukti kelias minutes...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>Pridėti įrenginį</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>Naudotojo vardas neprieinamas.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>Naudotojo vardas yra prieinamas.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>Naudotojo vardas yra neteisingas.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>Tinklo klaida.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>Sukurti Ring paskyrą</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Susieti šį įrenginį su paskyra</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>Kaip pridėti įrenginį</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation> Sveiki atvykę į</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1316,71 +1900,206 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Jūs gausite šiai formai užpildyti reikalingą PIN kodą. PIN kodas galios tik &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minučių&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Susikurkite savo profilį</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation>Įveskite savo visą vardą:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Susikurkite savo paskyrą</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Pasirinkite savo naudotojo vardą</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>Ieškoma...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation>Užregistruokite savo naudotojo vardą Ring sistemoje. Tai rezervuos naudotojo vardą ir tokiu būdu tik jūs galėsite jį naudoti. Jūsų draugai galės jums skambinti, vietoj jūsų RingID, naudodami jūsų naudotojo vardą.</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Registruoti viešąjį naudotojo vardą (eksperimentinis)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>Įveskite savo pin</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Slaptažodis</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Patvirtinkite slaptažodį</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Kuriama jūsų Ring paskyra...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Ankstesnis</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Kitas</translation>
     </message>

translations/ring_client_windows_ms.ts

diff --git a/translations/ring_client_windows_ms.ts b/translations/ring_client_windows_ms.ts
index 4b5b809..c3ce89f 100644
--- a/translations/ring_client_windows_ms.ts
+++ b/translations/ring_client_windows_ms.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Tentang</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Kredit</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Aplikasi Ring untuk Microsoft Windows.
@@ -53,90 +63,115 @@
         <translation>Aturan</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Utama</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Akaun</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Jenis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Nama panggilan</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Butiran</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Alamat server</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Nama pengguna</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Kara laluan</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proksi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Nombor peti suara</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Jawab panggilan automatik</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP diaktifkan</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Benarkan Panggilan Daripada TidaK Diketahui</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Benarkan Panggilan Daripada Kenalan</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Benarkan Panggilan Daripada Sejarah</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Tetapan Akaun Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Pilihan Nada Bunyi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Main</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Codec Audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Codec Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Lanjut</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Pendaftaran</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Guna TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Jarak Port Bunyi RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Penyulitan</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Perangkat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Alamat server pengagihan</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -429,12 +676,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Pindah</translation>
     </message>
@@ -455,104 +727,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Tambahkan sebagai kenalan</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Memanggil</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Panggilan</translation>
     </message>
@@ -645,6 +959,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -652,167 +974,283 @@
         <translation>Aturan</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Utama</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Nama</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Eksport</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Akaun</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -826,26 +1264,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation type="unfinished"/>
     </message>
@@ -873,17 +1336,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Terima</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -895,6 +1373,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -920,11 +1413,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"/>
     </message>
@@ -943,16 +1446,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Hapus</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -960,11 +1478,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation type="unfinished"/>
@@ -1058,22 +1591,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1105,12 +1643,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1166,36 +1740,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1232,67 +1816,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Tidak diketahui</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Sambungkan perangkat ini dengan akaun</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,71 +1890,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Kara laluan</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Sahkan kata laluan</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>

translations/ring_client_windows_nb.ts

diff --git a/translations/ring_client_windows_nb.ts b/translations/ring_client_windows_nb.ts
index bb78932..76a5886 100644
--- a/translations/ring_client_windows_nb.ts
+++ b/translations/ring_client_windows_nb.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Bidragsytere</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>Frihet, likhet, brorskap - Versjon 1.0</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation>Innstillinger</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Generell</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Alias</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parameter</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Vertsnavn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Brukernavn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Passord</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Talepostkassenummer</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Auto-svar på samtaler</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP aktivt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Tillat anrop fra kontakt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Tillat samtale fra historikk</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>Offentlig brukernavn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation>Registrer på blokkjeden</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>Nettadresse for navnetjeneste</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Kontoinnstillinger for Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Ringetonevalg</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Spill av</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Lyd/Bilde</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Lydkodek</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Videokodek</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Avansert</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Registrering</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Tidsgrense for registrering (sekunder):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Nettverksgrensesnitt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Lokal port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Samme som lokale parametre</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Oppgi publisert adresse og port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Bruk STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>Nettadresse for tjener</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Bruk TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP-øktforhandling (ICE-reserve)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Disse innstillingene brukes kun for SDP-øktforhandling hvis ICE ikke støttes av tjeneren til motparten.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>RTP-portintervall for tale</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Maks</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>RTP-portintervall for video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Sikkerhet</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Enheter</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Legg til enhet</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>For å legge en ny enhet til din Ring-konto, eksporterer du din konto på Ring. Dette vil generere en PIN som må skrives inn på din nye enhet i løpet av 5 minutter.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>Passord (kreves)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Eksporter på Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Din genererte PIN:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>Bannlyste kontakter</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Publisert adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>CA-sertifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Brukersertifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Privat nøkkel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Passord for privatnøkkel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Bruk standardsifer</translation>
     </message>
@@ -428,12 +675,22 @@
         <translation>Skjema</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>Bannlyst ID</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>Fjern bannlysning av kontakt, og legg til i kontaktliste</translation>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>eller slå nummer…</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Overfør</translation>
     </message>
@@ -454,105 +726,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Søk i kontakter eller skriv inn ringID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Samtaler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Kontaktforespørsler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>innstillingsmeny</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring er fri programvare for universell kommunikasjon som respekteret privatlivets fred for dets brukere.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Del din RingID</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Dette er din RingID.
 Kopier og del den med dine venner!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>Dobbeltklikk for å kopiere</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Feil ved generering av QR-kode</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Legg til kontakter</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>Skriv din melding her</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>send melding</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Ønsker å snakke med deg!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Svar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Kaller opp</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Ring</translation>
     </message>
@@ -645,6 +959,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -652,167 +974,283 @@
         <translation>Innstillinger</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Generell</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>avslutt innstillingsmeny</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Historikkinnstillinger</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Behold historikk i (dager)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Velg 0 for ubegrenset historikk)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Nullstill historikk</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Ymse innstillinger</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Behold minimert ved lukking</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>Se etter oppdateringer nå</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Opptaksinnstillinger</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Lagre i:</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Alltid ta opp</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>Skru på varsler</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Se etter oppdatering hver</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>dager</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Forhåndsvisning utilgjengelig under samtale</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Enhetsvalg</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Enhet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Oppløsning</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Utgangsenhet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Inngangsenhet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>legg til ny konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Importer</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Eksporter</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Kjør Ring ved oppstart</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Ny konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Er du sikker på at du vil tømme all din historikk?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Velg mappe</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>En feil inntraff under importering av konto.</translation>
     </message>
@@ -826,26 +1264,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Søk…</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Opprett ny kontakt</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Ny kontakt</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Skriv inn navn her…</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Lag</translation>
     </message>
@@ -873,17 +1336,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Aksepter</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Blokker</translation>
     </message>
@@ -895,6 +1373,21 @@
         <source>Form</source>
         <translation>Skjema</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -920,11 +1413,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
@@ -943,16 +1446,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Slett</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation>Slett og bannlys</translation>
     </message>
@@ -960,11 +1478,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Send tekstmelding…</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Kopier</translation>
@@ -1058,22 +1591,27 @@
         <translation>Skjema</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Ta bilde</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>eller</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation>Importer bilde</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Importer</translation>
     </message>
@@ -1105,12 +1643,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Auto</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1166,36 +1740,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Kvalitet</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Legg til kontakt</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Forløpt tid</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Legg på</translation>
@@ -1232,67 +1816,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Ukjent</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>Legg til enhet</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>Brukernavn ikke tilgjengelig.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>Brukernavnet er tilgjengelig.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>Ugyldig brukernavn.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>Nettverksfeil.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>Opprett Ring-konto</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Lenk denne enheten til en konto</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>Hvordan legge til en enhet</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation>Velkommen til</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,71 +1890,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Opprett din profil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation>Skriv inn hele navnet ditt:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Opprett din konto</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Velg ditt brukernavn</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>Søker…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation>Registrer brukernavnet ditt på Ring. Dette vil reservere brukernavnet ditt slik at du kan bruke det. Dine venner vil kunne ringe deg med ditt brukernavn istedenfor din RingID.</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Registrer offentlig brukernavn (eksperimentelt)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>Skriv inn din PIN</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Passord</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Bekreft passord</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Lager din Ring-konto...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Forrige</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Neste</translation>
     </message>

translations/ring_client_windows_nl.ts

diff --git a/translations/ring_client_windows_nl.ts b/translations/ring_client_windows_nl.ts
index fc598c3..2e0405a 100644
--- a/translations/ring_client_windows_nl.ts
+++ b/translations/ring_client_windows_nl.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Over</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Credits</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>Liberté, Égalité, Fraternité - versie 1.0</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>De Microsoft Windows-cliënt voor Ring.
@@ -53,90 +63,115 @@
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Alias</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parameters</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Hostnaam</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Voicemailnummer</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Oproepen automatisch beantwoorden</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP ingeschakeld</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Oproep van onbekende aanvaarden</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Oproep van contact aanvaarden</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Oproepen van gebruikers in oproepgeschiedenis aanvaarden</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>Publieke gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation>Registreren op blokketen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>Naamdienst-URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Ring-accountinstellingen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Beltoonselectie</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Afspelen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Audio/video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Audiocodecs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Videocodecs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Geavanceerd</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Registratie</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Tijdslimiet voor registratieverval (seconden):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Netwerkinterface</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Lokale poort:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Gelijk aan lokale parameters</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Stel gepubliceerd adres en poort in:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Poort</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>STUN gebruiken</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>Server-URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>TURN gebruiken</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Realm</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP-sessieonderhandeling (ICE-terugvaloptie)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Deze instellingen worden enkel gebruikt tijdens SDP-sessieonderhandelingen ingeval ICE niet ondersteund wordt door de server of de gebruiker.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Audio RTP-poortenreeks</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Video RTP-poortenreeks</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Beveiliging</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Mediastreamversleuteling (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Apparaten</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Apparaat toevoegen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>Om een nieuw apparaat aan je Ring-account toe te voegen, moet je je account exporteren naar de Ring. Dit zal een pincode genereren die je binnen de 5 minuten op je nieuwe apparaat moet invoeren.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>Wachtwoord (vereist)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Exporteren naar de Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Je gegenereerde pincode:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>Pincode</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation>Je dient deze pincode op je nieuwe apparaat binnen de 5 minuten in te voeren. Je kan op elk moment een nieuwe code genereren.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>Oké</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>Geblokkeerde contacten</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Mediastream versleutelen (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Gepubliceerd adres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>CA-certificaat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Gebruikerscertificaat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Geheime sleutel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Wachtwoord geheime sleutel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Standaardcodering gebruiken</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>Geblokkeerde ID</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>Contact deblokkeren en toevoegen aan contactenlijst</translation>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>of geef een nummer in...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Overdracht</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Zoek contacten of geef een Ring-ID in</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Gesprekken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Contactverzoeken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>instellingenmenu</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigt.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Deel je Ring-ID</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Dit is je Ring-ID.
 Deel hem met je vrienden!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>Dubbelklik om te kopiëren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Fout bij het aanmaken van QR-code</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Aan contacten toevoegen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Begin het gesprek!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>Typ hier je bericht</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>bericht versturen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation>BestId</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Wil met je praten!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Beantwoorden</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Negeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Bellen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Oproep</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>instellingen sluiten</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Geschiedenisinstellingen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Geschiedenis bewaren voor (dagen)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Kies 0 voor onbeperkte geschiedenis)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Geschiedenis wissen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Div. instellingen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Minimaliseren bij sluiten</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>Nu controleren op updates</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profiel</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Opname-instellingen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Opslaan in:</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Altijd opnemen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>Meldingen inschakelen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Automatisch controleren op updates elke</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>dagen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Voorbeeldweergave niet beschikbaar gedurende oproep</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Apparaatselectie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Apparaat</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Resolutie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Uitvoerapparaat</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Invoerapparaat</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>nieuwe account toevoegen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Importeren</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Exporteren</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Account</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Ring automatisch starten</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Account aanmaken</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Weet je zeker dat je de geschiedenis wil wissen?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Map kiezen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Er is een fout opgetreden tijdens het importeren van de account.</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Zoeken...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Nieuw contact aanmaken</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Nieuw contact</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Voer hier een naam in...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Aanmaken</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation>bestIdLabel</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Aanvaarden</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation>Verwerpen</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Blokkeren</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>Formulier</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Oké</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation>Verwijderen en blokkeren</translation>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Tekstbericht versturen...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Kopiëren</translation>
@@ -1059,22 +1592,27 @@
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Foto nemen</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>of</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation>Foto importeren</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Importeren</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Auto</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Microfoon dempen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Kwaliteit</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Gesprekken samenvoegen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Naam label</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Aan contact toevoegen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Tijd verstreken</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Ophangen</translation>
@@ -1233,67 +1817,67 @@
         <translation>Je account moet worden gemigreerd. Voer je wachtwoord in.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation>Je Ring-account wordt gemigreerd...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation>Je publieke gebruikersnaam wordt geregistreerd, dit kan enkele minuten duren...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>Een apparaat toevoegen</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>Gebruikersnaam is niet beschikbaar.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>Gebruikersnaam is beschikbaar.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>Gebruikersnaam is ongeldig.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>Netwerkfout.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>Ring-account aanmaken</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Dit apparaat aan een account koppelen</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>Hoe voeg ik een apparaat toe</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation>Welkom bij</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1316,71 +1900,206 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Je zal de pincode krijgen die je nodig hebt om dit proces te voltooien. De pincode is slechts &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minuten&lt;/span&gt; &lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;geldig.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Maak je profiel aan</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation>Voer je volledige naam in:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Maak je account aan</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Kies je gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>Zoeken...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation>Registreer je gebruikersnaam op de Ring, zodat enkel jij ze kan gebruiken. Je vrienden zullen je kunnen bellen met je gebruikersnaam ipv je Ring-ID.</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Registreer een publieke gebruikersnaam (experimenteel)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>Voer je pincode in</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Bevestig wachtwoord</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Je Ring-account wordt aangemaakt...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Vorige</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Volgende</translation>
     </message>

translations/ring_client_windows_nl_NL.ts

diff --git a/translations/ring_client_windows_nl_NL.ts b/translations/ring_client_windows_nl_NL.ts
index 26de1c6..d0d57cd 100644
--- a/translations/ring_client_windows_nl_NL.ts
+++ b/translations/ring_client_windows_nl_NL.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Spelen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Gevorderd</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Beveiliging</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -428,12 +675,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation type="unfinished"/>
     </message>
@@ -454,104 +726,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Voeg toe aan contacten</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Bellen</translation>
     </message>
@@ -644,6 +958,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -651,167 +973,283 @@
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -825,26 +1263,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation type="unfinished"/>
     </message>
@@ -872,17 +1335,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -894,6 +1372,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -919,11 +1412,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"/>
     </message>
@@ -942,16 +1445,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -959,11 +1477,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation type="unfinished"/>
@@ -1057,22 +1590,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1104,12 +1642,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1165,36 +1739,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1231,67 +1815,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,71 +1889,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>

translations/ring_client_windows_pa.ts

diff --git a/translations/ring_client_windows_pa.ts b/translations/ring_client_windows_pa.ts
index 228601a..461eee2 100644
--- a/translations/ring_client_windows_pa.ts
+++ b/translations/ring_client_windows_pa.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation>ਸੈਟਿੰਗ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -428,12 +675,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation type="unfinished"/>
     </message>
@@ -454,104 +726,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation type="unfinished"/>
     </message>
@@ -644,6 +958,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -651,167 +973,283 @@
         <translation>ਸੈਟਿੰਗ</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>ਇਤਿਹਾਸ ਮਿਟਾਓ</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -825,26 +1263,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation type="unfinished"/>
     </message>
@@ -872,17 +1335,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -894,6 +1372,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -919,11 +1412,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"/>
     </message>
@@ -942,16 +1445,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>ਮਿਟਾਓ</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -959,11 +1477,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation type="unfinished"/>
@@ -1057,22 +1590,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1104,12 +1642,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1165,36 +1739,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1231,67 +1815,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,71 +1889,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>

translations/ring_client_windows_pl.ts

diff --git a/translations/ring_client_windows_pl.ts b/translations/ring_client_windows_pl.ts
index 3e25929..8ff6e5b 100644
--- a/translations/ring_client_windows_pl.ts
+++ b/translations/ring_client_windows_pl.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>O programie</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Podziękowania</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Klient Ring dla Microsoft Windows.
@@ -53,90 +63,115 @@
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Generalne</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Alias</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parametry</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Nazwa hosta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Nazwa użytkownika</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Pełnomocnik</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Numer poczty głosowej</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Automatyczne odbierz połączeńia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP jest włączone</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Zezwól Na Połączenia Od Nieznanych</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Zezwól Na Połączenia Od Kontaku</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Zezwól Na Połączenia Od Historii</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Ustawienia Konta Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Wybierz Dzwonek</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Graj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Kodeki audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Kodeki wideo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Zaawansowane</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Rejestracja</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Limit czasu do rejestracji (w sekundach) :</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Interfejs Sieciowy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Port lokalny:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Tak samo jak lokalne parametry.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Ustaw opublikowany adres i port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Użyj STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>serwer URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Użyj TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>sfera</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Negocjacja sesji SDP (użyjcie ICE w przypadku awari)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Te ustawienia są tylko używane podczas negocjacji sesji SDP w przypadku gdzie ICE nie jest obsługiwany przez serwer lub innym użytkownikiem.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Zakres Portów Audio RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Zakres Portów Wideo RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Zabezpieczenia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Szyfrowanie Strumieni Multimedialnych (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Urządzenia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Szyfruj strumień multimedialny (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Opublikowany Adres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>Certyfikat CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Certyfikat użytkownika</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Klucz prywatny</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Hasło klucza prywatnego</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Użyj domyślnych szyfrów</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>albo wpisz numer...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Przełaczenie</translation>
     </message>
@@ -455,104 +727,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Szukaj kontakty lub wpisz Ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Rozmowy</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Zaproszenia</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>ustawienia menu</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wolności i prywatność swoich użytkowników</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Podziel się swoim ring id</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>To jest twój RingID. Skopiuj i podziel go ze swoimi przyjaciółmi!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Wystąpił błąd podczas generowania kodu QR.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Dodaj do kontaków</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Zacznij rozmowę !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>wyślij wiadomość</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Chce z tobą rozmawiać!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Odbierz</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Zignoruj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Dzwonienie</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Dzwoń</translation>
     </message>
@@ -645,6 +959,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -652,167 +974,283 @@
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Generalne</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>wyjdź z menu ustawień</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Ustawienia Historii</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Przechowaj historię do (dni)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Ustaw na 0 dla nieograniczonej historii)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Usuń historię</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Dodatkowe Ustawienia</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Przechowaj zminimalizowane przy zamknięciu</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Wideo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Imię</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Ustawienia Nagrań</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Zapisz w :</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Zawsze Nagrywaj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Sprawdź po aktualizacje automatycznie co</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>dni</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Podgląd jest niedostępny podczas rozmowy</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Wybierz Urządzenie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Urządzenie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Rozdzielczość</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Urządzenie Wyjściowe</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Urządzenie Wejściowe</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>dodaj nowe konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Importuj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Wyeksportuj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Uruchom Ring przy Starcie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Nowe konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Czy na pewno chcesz usunąć całą twoją historię?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Wybierz Folder</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Wystąpił błąd podczas importowania konta.</translation>
     </message>
@@ -826,26 +1264,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Szukaj...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Stwórz nowy kontakt</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Nowy kontakt</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Wpisz imię tutaj...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Stwórz</translation>
     </message>
@@ -873,17 +1336,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Akceptuj</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Blokuj</translation>
     </message>
@@ -895,6 +1373,21 @@
         <source>Form</source>
         <translation>Forma</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -920,11 +1413,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
@@ -943,16 +1446,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -960,11 +1478,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Wyślij wiadomość tekstową...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Skopiuj</translation>
@@ -1058,22 +1591,27 @@
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>albo</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Importuj</translation>
     </message>
@@ -1105,12 +1643,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Automatycznie</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1166,36 +1740,46 @@
         <translation>Wyłącz mikrofon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Jakość</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Dołącz Do Rozmów</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Etykieta Nazwiska</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Dodaj do kontaku</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Czas się skończył</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Odłożyć słuchawkę</translation>
@@ -1232,67 +1816,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Nieznane</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Połącz to urządzenie z kontem</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,71 +1890,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Stwórz swój profil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Stwórz konto</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Wybierz swoją nazwę użytkownika</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Zarejestruj publiczną nazwę użytkownika (eksperymentalne)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Potwierdź hasło</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Generowanie twojego konta Ring...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Następne</translation>
     </message>

translations/ring_client_windows_pl_PL.ts

diff --git a/translations/ring_client_windows_pl_PL.ts b/translations/ring_client_windows_pl_PL.ts
index eb6ced8..48d0f17 100644
--- a/translations/ring_client_windows_pl_PL.ts
+++ b/translations/ring_client_windows_pl_PL.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -428,12 +675,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation type="unfinished"/>
     </message>
@@ -454,104 +726,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation type="unfinished"/>
     </message>
@@ -644,6 +958,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -651,167 +973,283 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -825,26 +1263,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation type="unfinished"/>
     </message>
@@ -872,17 +1335,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -894,6 +1372,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -919,11 +1412,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"/>
     </message>
@@ -942,16 +1445,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -959,11 +1477,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Kopiuj</translation>
@@ -1057,22 +1590,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1104,12 +1642,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1165,36 +1739,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1231,67 +1815,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,71 +1889,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>

translations/ring_client_windows_pt.ts

diff --git a/translations/ring_client_windows_pt.ts b/translations/ring_client_windows_pt.ts
index 21a860a..f66df3f 100644
--- a/translations/ring_client_windows_pt.ts
+++ b/translations/ring_client_windows_pt.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Pseudônimo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Nome do host</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Usuário</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Número do correio de voz</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Chamadas respondias automaticamente</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP habilitado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Avançado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>A sessão expira em (segundos):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Igual aos parâmetros locais</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Defina endereço e porta:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Usar STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Usar TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Estas configurações serão usadas durante o estabelecimento de sessão via SDP, caso as configurações de roteamento não permitam acesso ao servidor ou a um peer</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Segurança</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>Certificado CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Certificado do usuário</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Chave privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Senha da chave privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Use cifras padrão</translation>
     </message>
@@ -428,12 +675,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation type="unfinished"/>
     </message>
@@ -454,105 +726,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Conversas</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Este é seu RingID.
 Copie e avise seus amigos!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Adicionar aos contactos</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Chamada</translation>
     </message>
@@ -645,6 +959,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -652,167 +974,283 @@
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Vídeo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Nova Conta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -826,26 +1264,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation type="unfinished"/>
     </message>
@@ -873,17 +1336,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -895,6 +1373,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -920,11 +1413,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"/>
     </message>
@@ -943,16 +1446,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -960,11 +1478,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation type="unfinished"/>
@@ -1058,22 +1591,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1105,12 +1643,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1166,36 +1740,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1232,67 +1816,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,71 +1890,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Gerando sua conta Ring...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Próximo</translation>
     </message>

translations/ring_client_windows_pt_BR.ts

diff --git a/translations/ring_client_windows_pt_BR.ts b/translations/ring_client_windows_pt_BR.ts
index 0c2871e..cbae27e 100644
--- a/translations/ring_client_windows_pt_BR.ts
+++ b/translations/ring_client_windows_pt_BR.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Créditos</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>Liberdade, Igualdade, Fraternidade - Versão 1.0</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>O cliente Microsoft Windows para Ring
@@ -53,90 +63,115 @@
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Conta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Apelido</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parâmetros</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Nome de usuário</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Número do correio de voz</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Chamadas de Auto-Resposta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP ativado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Aceitar Chamada de Desconhecido</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Aceitar Chamada de Contato</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Aceitar Chamada de Histórico</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>Usuário publico</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation>Registrar no blockchain</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>URL do servidor</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Configurações de Conta do Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Selecionar toque</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Reproduzir</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Áudio/Vídeo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Codecs de Áudio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Codecs de Vídeo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Avançado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Registro</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Tempo de expiração de registro (segundos):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Interface de Rede</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Porta Local:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Igual aos parâmetros locais</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Configurar endereço e portas publicadas:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Usar STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>URL do servidor</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Usar TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Domínio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Negociação de sessão SDP ( ICE Fallback)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Estas configurações serão apenas utilizadas durante uma negociação de sessão SDP, caso ICE não seja suportado pelo servidor ou membro.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Variação de portas de audio RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Máx</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Intervalo de portas de Video RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Segurança</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Criptografia de Fluxo de Mídia (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Dispositivos</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Adicionar dispositivo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>Para adicionar um novo dispositivo à sua conta Ring, você deve exportar sua conta no Ring. Isso gerará um PIN que deve ser entrado em seu novo dispositivo dentro de 5 minutos desde a sua geração.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>Senha (necessária)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Exportar no Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Seu PIN gerado:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation>Este PIN deve ser inserido no seu novo dispositivo nos próximos 5 minutos. Você pode ter que gerar um novo a qualquer momento.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>Contatos Banidos</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Encriptar fluxo de mídia (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Endereço publicado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>Certificado de CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Certificado de usuário</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Chave Privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Senha de chave privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Utilizar cifras padrão</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>ID Banido</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>Repatriar, e adicionar a lista de contatos</translation>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>ou digite um número...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Transferência</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Busque por contatos ou insira o RingID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Conversas</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Solicitações de contatos</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>menu de configurações</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring é um software livre para comunicação universal que respeita as liberdades e privacidade de seus usuários.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Compartilhar seu RingID</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Este é o seu RingID.
 Salve e compartilhe com seus amigos!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>Duplo-clique para copiar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Erro ao gerar o QRCode</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Adicionar aos contatos</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Comece uma conversa!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>Digite sua mensagem aqui</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>enviar mensagem</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation>BestID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Quer conversar com você!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Resposta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Chamando</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Chamar</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>fechar menu de configurações</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Configurações de histórico</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Manter histórico por (dias)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Insira 0 para histórico ilimitado)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Limpar histórico</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Configurações diversas</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Manter minimizado ao fechar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>Checar por atualizações agora</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Vídeo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Gravar configurações</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Salvar em :</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Sempre gravar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>Ativar notificações</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Verificar atualizações automaticamente a cada</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>dias</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Pré-visualização não disponível em chamadas</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Seleção de dispositivo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Resolução</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Dispositivo de saída</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Dispositivo de entrada</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>adicionar nova conta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Importar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Exportar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Conta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Iniciar ao ligar o Ring</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Nova conta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Você tem certeza que deseja limpar todo o seu histórico?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Escolher diretório</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Ocorreu um erro ao importar a conta.</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Procurando...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Criar novo contato</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Novo Contato</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Entre um nome aqui...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Criar</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation>Alias de bestID</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Aceitar</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation>Descartar</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Bloquear</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Deletar</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation>Deletar e banir</translation>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Enviar mensagem de texto...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Copiar</translation>
@@ -1059,22 +1592,27 @@
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Tirar foto</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>ou</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation>Importar foto</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Importar</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Automático</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Desativar microfone</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Qualidade</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Juntar chamadas</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Nome do rótulo</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Adicionar a contato</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Tempo decorrido</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Desligar</translation>
@@ -1233,67 +1817,67 @@
         <translation>Sua conta precisa ser migrada. Entre com sua senha.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation>Migrando sua conta do Ring...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation>Registrando seu usuário público, isto pode tomar alguns minutos...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>Adicionar dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>Usuário não disponível.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>Usuário disponível.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>Usuário é inválido.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>Erro na Rede.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>Criar uma conta Ring</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Associar este dispositivo a uma conta</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>Como adicionar um dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation>Bem vindo ao</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1316,71 +1900,206 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Você irá receber o PIN necessário para completar este formulário. Este PIN só será válido por &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Criar um Perfil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation>Digite seu nome completo:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Criar uma conta</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Escolha seu nome de usuário</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>Buscando...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation>Registre seu usuário no Ring. Isto irá reservar o usuário para que apenas você possa o utilizar. Seus amigos serão capazes de chama-lo com seu usuário ao invés de com seu RingID</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Registrar usuário público (experimental)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>Entre o seu pin</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Confirmar senha</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Criando sua conta Ring...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Próximo</translation>
     </message>

translations/ring_client_windows_ro.ts

diff --git a/translations/ring_client_windows_ro.ts b/translations/ring_client_windows_ro.ts
index a96808e..edda262 100644
--- a/translations/ring_client_windows_ro.ts
+++ b/translations/ring_client_windows_ro.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Credite</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation>Setari</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Alias</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Nume de utilizator</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Redare</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Avansat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Seuritate</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -428,12 +675,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation type="unfinished"/>
     </message>
@@ -454,104 +726,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Solicitări de contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Adaugă la contacte</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Sună</translation>
     </message>
@@ -644,6 +958,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -651,167 +973,283 @@
         <translation>Setari</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Nume</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -825,26 +1263,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation type="unfinished"/>
     </message>
@@ -872,17 +1335,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -894,6 +1372,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -919,11 +1412,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"/>
     </message>
@@ -942,16 +1445,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Șterge</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -959,11 +1477,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation type="unfinished"/>
@@ -1057,22 +1590,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1104,12 +1642,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1165,36 +1739,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1231,67 +1815,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Necunoscut</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,71 +1889,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Confirmă parola</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>

translations/ring_client_windows_ru.ts

diff --git a/translations/ring_client_windows_ru.ts b/translations/ring_client_windows_ru.ts
index 9f45dee..a1f11e9 100644
--- a/translations/ring_client_windows_ru.ts
+++ b/translations/ring_client_windows_ru.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Благодарности</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>Свобода, равенство и братство — Версия 1.0</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Клиент Ring для Windows.
@@ -53,90 +63,115 @@
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Общий</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Аккаунт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Прозвище</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Имя компьютера</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Прокси</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Номер голосовой почты</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Автоответ звонков</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP разрешен</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Разрешать звонки от незнакомых</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Разрешать звонки от лиц из списка контактов</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Разрешать звонки от лиц из истории</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>Публичное имя пользователя</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation>Зарегистрировать в блокчейн</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>URL-адрес службы имен</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Настройки аккаунта Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Выбор мелодии звонка</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Играть</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Звук/Видео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Аудио кодеки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Видео кодеки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Дополнительно</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Регистрация</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Регистрация истекает через (секунды):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Сетевой интерфейс</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Локальный порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Такие же, как и локальные параметры</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Установить публикуемый адрес и порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Исполльзовать STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>Адрес сервера</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Использовать TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Область </translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Согласование сесcии SDP (резерв ICE)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Диапазон портов для RTP аудио</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Максимум</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Диапазон портов для RTP видео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Безопасность</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Шифрование медиапотока (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Устройства</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Добавить устройство</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>Для привязки нового устройства к вашему аккаунту Ring вам нужно экспортировать ваш аккаунт в сеть Ring. Это сгенерирует PIN код, который потребуется ввести на вашем новом устройстве в течение 5 минут с момента его генерации.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>Пароль (обязательно)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Экспорт в сеть Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Ваш сгенерированный PIN:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation>Этот PIN должен быть введен на новом устройстве в течение 5 минут. Вы можете сгенерировать новый в любой момент.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>Заблокированные контакты</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Шифровать медиапотоки (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Публикуемый адрес</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>Сертификат удостоверяющего центра</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Пользовательский сертификат</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Закрытый ключ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Пароль к закрытому ключу</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Использовать шифрование по-умолчанию</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>Заблокированный ID</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>Разблокировать контакт и добавить в список контактов</translation>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>или введите номер...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Передача</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Найдите контакты или введите Ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Разговоры</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Запросы на добавление в контакты</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>меню настроек</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring — это свободная программа для всеобщей связи, уважающая свободы и конфиденциальность ее пользователей.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Поделитесь вашим Ring ID</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Это ваш RingID.
 Скопируйте и поделитесь им с вашими друзьями!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>Двойной клик для копирования</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Ошибка при создании QR кода</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Добавить в контакты</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Начните разговор!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>Введите ваше сообщение здесь</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>отправить сообщение</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Хочет поговорить с вами!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Ответить</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Игнорировать</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Вызов</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Звонок</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Общее</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>выйти из меню настроек</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Настройки истории</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Хранить историю (дней):</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(0 = хранить всю историю)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Удалить историю сообщений</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Другие настройки</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Сворачивать вместо закрытия</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>Проверить обновления</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Видео</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Профиль</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Настройки записи</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Сохранить в:</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Всегда записывать</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>Включить уведомления</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Проверять обновления автоматически каждые</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>дней</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Предпросмотр недоступен во время звонка</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Выбор устройства</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Устройство</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Разрешение</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Устройство вывода</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Устройство ввода</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>добавить новый аккаунт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Импорт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Экспорт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Аккаунт</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Запускать Ring при старте системы</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Новый аккаунт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Вы уверены, что хотите удалить всю историю? </translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Выбрать папку</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Во время импортирования аккаунта произошла ошибка.</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Поиск...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Создать новый контакт</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Новый контакт</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Введите имя...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Создать</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Принять</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation>Отклонить</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Заблокировать</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>Форма</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Отправить текстовое сообщение...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Копировать</translation>
@@ -1059,22 +1592,27 @@
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Сделать фото</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>или</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation>Импорт фотографий</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Импорт</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Авто</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Выключить микрофон</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Качество</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Присоединиться к звонкам</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Добавить в контакт</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Прошло времени</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Повесить трубку</translation>
@@ -1233,67 +1817,67 @@
         <translation>Ваша учетная запись должна быть перенесена. Введите ваш пароль.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation>Переносим ваш аккаунт Ring…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation>Регистрируем ваше публичное имя пользователя, это может занять несколько минут…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>Добавить устройство</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>Имя пользователя недоступно.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>Имя пользователя доступно.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>Недопустимое имя пользователя.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>Ошибка сети.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>Создать аккаунт Ring</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Привязать это устройство к аккаунту</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>Как добавить устройство</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation>Добро пожаловать в</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1316,71 +1900,206 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Вы получите PIN, необходимый для заполнения этой формы. PIN код действителен только в течение &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 минут&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Создайте свой профиль</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation>Введите ваше полное имя:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Создайте свой аккаунт</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Выберите ваше имя пользователя</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>Поиск…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation>Зарегистрируйте свое имя пользователя в Ring. Это зарезервирует имя пользователя, так что только вы сможете его использовать. Ваши друзья смогут связаться с вами по вашему имени вместо RingID.</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Зарегистрировать публичное имя (экспериментальная функция)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>Введите ваш PIN</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Подтвердить пароль</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Создание вашего аккаунта Ring...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Далее</translation>
     </message>

translations/ring_client_windows_ru_RU.ts

diff --git a/translations/ring_client_windows_ru_RU.ts b/translations/ring_client_windows_ru_RU.ts
index d1d9a6e..45839cb 100644
--- a/translations/ring_client_windows_ru_RU.ts
+++ b/translations/ring_client_windows_ru_RU.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>О продукте</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Кредиты</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Microsoft Windows клиент для Ring.
@@ -53,90 +63,115 @@
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Основные</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Учетная запись</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Псевдоним</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Узел</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Пользователь</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Прокси</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Номер голосовой почты</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Автоответчик</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Воспроизвести</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Аудио/видео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Дополнительно</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Регистрация</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Время истечения регистрации в секундах:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Сетевой интерфейс</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Аналогично локальным параметрам</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Установить публичный адрес и порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Использовать STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Использовать TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Область</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Диапазон портов RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Мин</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Макс</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Безопасность</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Публичный адрес</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>CA сертификат</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Сертификат пользователя</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Приватный ключ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Пароль приватного ключа</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -429,12 +676,22 @@
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Перевод</translation>
     </message>
@@ -455,104 +727,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Введите имя контакта или его ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Беседы</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Поделиться вашим RingID.</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Добавить контакт</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Начать разговор !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>Отправить сообщение</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Хочет поговорить с вами!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Ответ</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Игнорировать</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>звонящий</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Звонок</translation>
     </message>
@@ -645,6 +959,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -652,167 +974,283 @@
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Основные</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>Выход из настроек</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Настройки Истории</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Сохранять историю  за ( Дней )</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Очистка истории</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Оставлять свернутым при закрытии</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Видео</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Профиль</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Настройки записи</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Сохранить в</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Проверять обновления каждые</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>дней</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Устройство</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Разрешение</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>добавить новую учетную запись</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Импорт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Экспорт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Учетная запись</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Новая учетная запись</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Вы уверены что хотите удалить история поиска?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Выбрать каталог</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>При импорте учетной записи произошла ошибка</translation>
     </message>
@@ -826,26 +1264,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Поиск...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Создать новый контакт</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Новый контакт</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Введите имя здесь...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Создать</translation>
     </message>
@@ -873,17 +1336,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Принять</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -895,6 +1373,21 @@
         <source>Form</source>
         <translation>Форма</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -920,11 +1413,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
@@ -943,16 +1446,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -960,11 +1478,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Отправить текстовое сообщение...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Копировать</translation>
@@ -1058,22 +1591,27 @@
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Фотографировать</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>или</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Импорт</translation>
     </message>
@@ -1105,12 +1643,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Автоматически</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1166,36 +1740,46 @@
         <translation>Отключить микрофон</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Качество</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Добавить в контакты</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Прошедшее время</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Разъединить</translation>
@@ -1232,67 +1816,67 @@
         <translation>Ваша учетная запись должна быть перенесена. Введите ваш пароль.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,71 +1890,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Выберите ваше имя пользователя</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Подтвердите пароль</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Создать вашу учетную запись Ring</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Далее</translation>
     </message>

translations/ring_client_windows_sk_SK.ts

diff --git a/translations/ring_client_windows_sk_SK.ts b/translations/ring_client_windows_sk_SK.ts
index f48d731..336e14e 100644
--- a/translations/ring_client_windows_sk_SK.ts
+++ b/translations/ring_client_windows_sk_SK.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>O programe</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation>Nastavenie</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Všeobecné</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Alias</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP zapnuté</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Spusť</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Registrácia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Zariadenia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Pridaj zariadenie</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Zruš</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
@@ -428,12 +675,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Prenos</translation>
     </message>
@@ -454,104 +726,146 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Odpoveď</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Volanie</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Zruš</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Volaj</translation>
     </message>
@@ -644,6 +958,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -651,167 +973,283 @@
         <translation>Nastavenie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Všeobecné</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Nastavenia historie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Názov</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Zariadenie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Účet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -825,26 +1263,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Vytvor</translation>
     </message>
@@ -872,17 +1335,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -894,6 +1372,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -919,11 +1412,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Zruš</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation type="unfinished"/>
     </message>
@@ -942,16 +1445,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Zruš</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Vymaž</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -959,11 +1477,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Kopíruj</translation>
@@ -1057,22 +1590,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1104,12 +1642,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1165,36 +1739,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1231,67 +1815,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Neznámy</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1305,71 +1889,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Ďalej</translation>
     </message>

translations/ring_client_windows_sl.ts

diff --git a/translations/ring_client_windows_sl.ts b/translations/ring_client_windows_sl.ts
index 0eddbc1..4be759b 100644
--- a/translations/ring_client_windows_sl.ts
+++ b/translations/ring_client_windows_sl.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>O Ring</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Zasluge</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>Liberté, Égalité, Fraternité! -  Različica 1.0</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Microsoft Windows odjemalec za Ring.
@@ -53,90 +63,115 @@
         <translation>Nastavitve</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Splošno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Račun</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Tip</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Alias</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parametri</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Strežnik</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Uporabnik</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Geslo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Številka glasovnega predala</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Samodejno odgovori klice</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP omogočen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Dovoli klice nepoznanih klicateljev</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Dovoli klice stika</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Dovoli klice iz zgodovine</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>Javno ime</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation>Prijava na &apos;blockchain&apos;</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>URL imenske storitve</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Nastavitve Ring računa</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Izbira zvonjenja</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Predvajaj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Avdio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Avdio kodeki</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Video kodeki</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Napredno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Prijava</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Časovna omejitev prijave (sek):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Mrežni vmesnik</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Lokalna vrata:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Isto kot lokalni parametri</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Nastavi objavljen naslov in vrata:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Naslov</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Vrata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Uporabi STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>URL strežnika</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Uporabi TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Območje (realm)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Dogovarjanje seje SDP (ICE Fallback)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Te nastavitve so uporabljene samo ob dogovarjanju SDP seje v primeru, da ICE protokol ni podprt s strani strežnika ali vozla.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Omočje RTP vrat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Območje vrat za video RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Varnost</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Šifriranje pretoka vsebine (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Naprave</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Dodaj napravo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>Za dodati novo napravo v tvoj Ring račun, moraš izvoziti tvoj račun na Ring. To bo ustvarilo PIN, ki ga moraš vnesti na novi napravi v roku 5 minut.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>Geslo (zahtevano)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Izvozi v Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Tvoj ustvarjen PIN:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation>Ta PIN moraš vnesti na tvoji novi napravi v roku 5 minut. Lahko ustvariš nov PIN kadarkoli.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>Zavrnjeni stiki</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Šifriraj pretok podatkov (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Objavi naslov</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>CA Certifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Osebni certifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Zasebni ključ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Geslo zasebnega ključa</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Uporabi privzete ćiperje</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>Zavrnjen ID</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>Prekliči zavrnitev stika in dodaj med aktivne stike</translation>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>ali vpiši številko...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Prevezava</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Poišči stike ali vpiši RingID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Pogovori</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Zahteve za povezavo</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>meni nastavitev</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring je zastonj programska oprema za univerzalno komunikacijo, ki spoštuje svoboščine in zasebnost uporabnikov.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Deli svoj RingID</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>To je tvoj RingID.
 Kopiraj in deli s svojimi prijatelji!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>Kopiraj z dvojnim klikom</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Napaka med pripravo QR kode</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Dodaj v stike</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Začni pogovor !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>Vpiši tvoje sporočilo tukaj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>pošlji sporočilo</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation>BestID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Želi govoriti s tabo!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Odgovori</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Ignoriraj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Kličem</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Kliči</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Nastavitve</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Splošno</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation>Avdio/Video</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation>Računi</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>izhod iz nastavitev</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Nastavitve zgodovine</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Ohrani zgodovino za (dni)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Vpiši 0 za neomejeno zgodovino)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Počisti zgodovino</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Razne nastavitve</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Minimiziraj ob zaprtju</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>Preveri posodobitve zdaj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Nastavitve snemanja</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Shrani v :</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Vedno snemaj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>Omogoči obvestila</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Samodejno preverjaj posodobitve vsakih</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>dni</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Predogled ni možen med klicem</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Izbira naprave</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Naprava</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Resolucija</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Izhodna naprava</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Vhodna naprava</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>dodaj nov račun</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Uvoz</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Izvoz</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Račun</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Zaženi Ring ob zagonu</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Nov račun</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Ali resnično želiš počistiti vso zgodovino?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Izberi mapo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Zgodila se je napaka med uvozom računa.</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Iščem...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Ustvari nov stik</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Nov stik</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Vpiši ime tukaj...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Ustvari</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Sprejmi</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation>Opusti</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Blokiraj</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>Obrazec</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>V redu</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Pobriši</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Pošlji besedilno sporočilo</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Kopiraj</translation>
@@ -1059,22 +1592,27 @@
         <translation>Obrazec</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Naredi sliko</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>ali</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Uvoz</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Samodejno</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Izključi mikrofon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Kvaliteta</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Združi klice</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Oznaka imena</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Dodaj med stike</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Pretečeni čas</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation>Konfiguracija</translation>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Prekini</translation>
@@ -1233,67 +1817,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation>Migriram tvoj Ring račun...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Neznano</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation>Prijavljam tvoje javno ime, lahko traja nekaj časa...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>Dodaj napravo</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>Uporabniško ime ni na voljo.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>Uporabniško ime je na voljo.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>Uporabniško ime ni veljavno.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>Napaka mreže.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>Ustvari Ring račun</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Poveži to napravo k računu</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>Kako dodati napravo</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation>Dobrodošli v</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,71 +1891,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Ustvari svoj profil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation>Vpiši svoje polno ime:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Ustvari svoj račun</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Izberi svoje uporabniško ime:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>Iščem...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Prijavi javno ime (eksperimentalno)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>Vpiši svoj PIN</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Geslo</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Potrdi geslo</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Ustvarjam tvoj Ring račun...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Prejšni</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Naprej</translation>
     </message>

translations/ring_client_windows_sq_AL.ts

diff --git a/translations/ring_client_windows_sq_AL.ts b/translations/ring_client_windows_sq_AL.ts
index 525e9d2..153c91f 100644
--- a/translations/ring_client_windows_sq_AL.ts
+++ b/translations/ring_client_windows_sq_AL.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Mbi</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Kredite</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Klienti Ring për Microsoft Windows.
@@ -53,90 +63,115 @@
         <translation>Rregullime</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Të përgjithshme</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Llogari</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Lloj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Alias</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parametra</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Strehëemër</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Emër përdoruesi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Krijoni llogari</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Ndërmjetës</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Numër voicemail</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Vetëpërgjigju thirrjeve</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Lejo Thirrje Prej të Panjohurish</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Lejo Thirrje Prej Kontaktesh</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Lejo Thirrje Prej Historiku</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Rregullime Llogarie Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Përzgjedhje Zileje</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Luaje</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Kodekë audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Kodekë video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Të mëtejshme</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Regjistrim</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Kohë skadimi regjistrimi (në sekonda):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Ndërfaqe Rrjeti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Njësoj si parametrat vendorë</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Adresë</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Portë</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Përdor STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>URL Shërbyesi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Përdor TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Maks.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Siguri</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Pajisje</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Anuloje</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Adresë e Publikuar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>Dëshmi AD</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Dëshmi përdoruesi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Kyç privat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Fjalëkalim kyçi privat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Përdor shifër parazgjedhje</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>ose shtypni një numër…</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation type="unfinished"/>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Kërkoni te kontaktet ose jepni ID Ring-u</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Biseda</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>menu rregullimesh</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring është software i lirë për komunikim universal që respekton privatësinë e përdoruesve të tij.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Ndani me të tjerët ID-në tuaj Ring</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Kjo është RingID-ja juaj.
 Kopjojeni dhe jepuani shokëve!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Gabim teksa prodhohej kodi QR</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Shtoje te kontaktet</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Filloni bisedën!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>dërgo mesazh</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Dëshiron të bisedojë me ju!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Përgjigjuni</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Shpërfille</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Anuloje</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation type="unfinished"/>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Rregullime</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Të përgjithshme</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>dil nga menu rregullimesh</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Rregullime Historiku</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Historikun mbaje për (ditë)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Pastroje Historikun</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Emër</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>ditë</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Pajisje</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Llogari</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Llogari e Re</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Kontakt i Ri</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Krijoje</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Pranoje</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Anuloje</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Anuloje</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Fshije</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Kopjoje</translation>
@@ -1059,22 +1592,27 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Shtoje te kontakti</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1233,67 +1817,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>E panjohur</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Lidheni këtë pajisje me një llogari</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,71 +1891,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Krijoni profilin tuaj</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Krijoni llogarinë tuaj</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Regjistroni emër përdoruesi publik (eksperimentale)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Fjalëkalim</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Ripohoni fjalëkalimin</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Pasuesi</translation>
     </message>

translations/ring_client_windows_sv.ts

diff --git a/translations/ring_client_windows_sv.ts b/translations/ring_client_windows_sv.ts
index 966220f..22b3f8a 100644
--- a/translations/ring_client_windows_sv.ts
+++ b/translations/ring_client_windows_sv.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Tack till</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>Liberté, Égalité, Fraternité - Version 1.0</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Microsoft Windows-klient för Ring.
@@ -53,90 +63,115 @@
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Allmänt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Alias</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Parametrar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Värdnamn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Användarnamn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Lösenord</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Nummer till röstbrevlåda</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Besvara samtal automatiskt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP aktiverad</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Tillåt samtal från okända</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Tillåt samtal från kontakt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Tillåt samtal från historik</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>Offentligt användarnamn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation>Registrering i blockkedjan</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>Namntjänst-URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Ring-kontoinställningar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Ringsignaler</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Spela</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Ljud/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Ljudkodekar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Videokodekar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Avancerat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Registrering</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Tidsgräns för registrering (sekunder):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Nätverksgränssnitt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Lokal port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Samma som lokala parametrar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Ange publicerad adress och port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Adress</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Använd STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>Serveradress</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Använd TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Område</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP sessionsförhandling (ICE-reserv)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Dessa inställningar används endast under SDP-sessionsförhandling, om ICE inte stöds av server eller deltagare.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Audio RTP portintervall</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Video RTP portintervall</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Säkerhet</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Mediaströmkryptering (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Enheter</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Lägg till enhet</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>För att lägga till en ny enhet till ditt Ring-konto, exporterar du ditt befintliga konto. Detta genererar en PIN-kod, som inom 5 minuter måste anges i din nya enhet.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>Lösenord (obligatoriskt)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Export på Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Din PIN-kod:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>PIN-kod</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation>Denna PIN-kod skall anges på din nya enhet, inom 5 minuter. Du kan generera en kod ny när du vill.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>Bannlysta kontakter</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Kryptera mediaströmmar (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Publiserad adress</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>CA-certificat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Användarcertifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Privat nyckel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Lösenord för privat nyckel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Använd standardshiffer</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>Bannlyst ID</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>Ta bort bannlysningen för kontakten, och lägg till i kontaktlistan</translation>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>eller ange nummer...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Överför</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Sök kontakter eller ange Ring-ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Konversationer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Kontaktförfrågningar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>inställningsmeny</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring är fri mjukvara för universell kommunikation, med respekt för användarens frihet och integritet.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Dela ditt Ring-ID</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Detta är ditt Ring-ID.
 Kopiera och dela det med dina vänner!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>Dubbelklicka för att kopiera</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Ett fel inträffade vid generering av QR-kod</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Lägg till i kontakter</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Starta konversationen!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>Skriv ditt meddelande här</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>Skicka meddelande</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation>Best-ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Vill prata med dig!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Svara</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Ignorera</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Ringer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Ring upp</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Allmänt</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>Avsluta inställningsmenyn</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Historikinställningar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Spara historiken i (dagar)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(Ange 0 för obegränsad historik)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Rensa historik</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Div. inställningar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Minimera istället för att avsluta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>Sök efter uppdateringar nu</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Inspelningsinställningar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Spara i :</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Spela alltid in</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>Aktivera aviseringar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Sök efter uppdateringar varje</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>dagar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Förhandsvisa otillgängliga under samtal</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Enheter</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Enhet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Upplösning</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Utdataenhet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Indataenhet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>Lägg till nytt konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Importera</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Exportera</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Starta Ring vid systemstart</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Nytt konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Vill du verkligen rensa bort all din historik?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Välj mapp</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Ett fel inträffade vid kontoimport.</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Sök...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Skapa ny kontakt</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Ny kontakt</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Ange ett namn här...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Skapa</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation>Best-ID-etikett</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Acceptera</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Blockera</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>Formulär</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation>Ta bort och bannlys</translation>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Skicka textmeddelande...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Kopiera</translation>
@@ -1059,22 +1592,27 @@
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Ta ett foto</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>eller</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation>Importera foto</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Importera</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Auto</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Stäng av mikrofon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Kvalitet</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Anslut till samtal</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Namnetikett</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Lägg till i kontakt</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Förfluten tid</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Lägg på</translation>
@@ -1233,67 +1817,67 @@
         <translation>Ditt konto måste migreras. Ange ditt lösenord.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation>Migrerar ditt Ring-konto...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Okänd</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation>Registrerar ditt offentliga användarnamn, det kan ta några minuter...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>Lägg till en enhet</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>Användarnamnet är inte tillgängligt.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>Användarnamnet är tillgängligt.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>Användarnamnet är ogiltigt.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>Nätverksfel.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>Skapa Ring-konto</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Koppla denna enhet till ett konto</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>Hur man lägger till en enhet</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation>Välkommen till</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1316,71 +1900,206 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Du får då den nödvändiga PIN-koden för att slutföra detta formulär. PIN-koden är giltig endast i &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minuter&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Skapa din profil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation>Ange ditt fullständiga namn:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Skapa ditt konto</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Välj användarnamn</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>Söker...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation>Registrera ditt användarnamn på Ring. Detta reserverar användarnamnet så att endast du kan använda det. Dina vänner kan kontakt dig med ditt användarnamn istället för att använda ditt Ring-ID.</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Registrera ett offentligt namn (experimentellt)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>Ange din PIN-kod</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Lösenord</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Bekräfta lösenord</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Genererar ditt Ring-konto...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Föregående</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Nästa</translation>
     </message>

translations/ring_client_windows_tr.ts

diff --git a/translations/ring_client_windows_tr.ts b/translations/ring_client_windows_tr.ts
index c9633a0..707d629 100644
--- a/translations/ring_client_windows_tr.ts
+++ b/translations/ring_client_windows_tr.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Hakkında</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Krediler</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>Liberté, Égalité, Fraternité - Sürüm 1.0</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Microsoft Windows için Ring istemcisi.
@@ -53,90 +63,115 @@
         <translation>Ayarlar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Genel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Hesap</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Tür</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Takma ad</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Değişkenler</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Sunucu adı</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Kullanıcı adı</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Vekil</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Sesli ileti numarası</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Aramaları kendiliğinden yanıtla</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP etkin</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Bilinmeyenden Aramaya İzin Ver</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Kişilerden Aramaya İzin Ver</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Geçmişten Aramaya İzin Ver</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>Herkese açık kullanıcı adı</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation>Kayıt zinciri üzerinde kaydet</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>Ad hizmeti adresi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Ring Hesap Ayarları</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Zil Sesi Seçimi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Oynat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Ses/Görüntü</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Ses çözücüleri</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Görüntü çözücüler</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Gelişmiş</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Kaydolma</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Kaydolma bitimi zaman aşımı (saniye):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Ağ Arayüzü</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Yerel Delik:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Yerel değişkenlerle aynı</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Yayımlanan yeri ve deliği belirle:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Delik</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>STUN kullan</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>Sunucu adresi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>TURN kullan</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Yetki alanı</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP Görüşme Oturumu (ICE Geri çekilme)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
         <translation>Bu ayarlar yalnızca SDP oturum müzakeresi sırasında ICE&apos;nin sunucu ya da eş tarafından desteklenmemesi durumunda kullanılacaktır.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>RTP Ses Port Aralığı</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Asgari</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Azami</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Görüntü RTP Delik Aralığı</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Güvenlik</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Ortam Akışı Şifreleme (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>Aygıtlar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>Aygıt ekle</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>Ring hesabınıza yeni bir aygıt eklemek için hesabınızı Ring üzerinden dışarıya aktarın. Bu işlem yeni eklenecek cihaza 5 dakika içerisinde girilmesi gereken bir PIN kodu yaratacaktır.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>Parola (gerekli)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Ring&apos;de Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>Oluşturulan pin&apos;iniz:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation>Bu anahtar 5 dakika içerisinde aygıtınıza girilmiş olmalı. İstediğiniz an yenisini oluşturabilirsiniz.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>TAMAM</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>Engellenmiş Kişiler</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Ortam akışlarını şifrele (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Yayımlanan Yer</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>CA sertifikası</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Kullanıcı sertifikası</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Özel anahtar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Özel anahtar parolası</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Öntanımlı şifrelemeyi kullan</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>Engellenen Kimlik</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>Kişinin engelini kaldır, kişi listesine ekle</translation>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>ya da numara girin...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Aktarım</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Kişileri ara veya Ring kimliği gir</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Konuşmalar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>İletişim istekleri</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>ayarlar menüsü</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring; kullanıcılarının özgürlüklerine ve gizliliğine önem veren, evrensel iletişim için özgür yazılımdır.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Ring kimliğinizi paylaşın</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Bu senin RingID&apos;in.
 Kopyala ve arkadaşlarınla paylaş!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>Kopyalamak için çift tıkla</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>QR Kodu oluşturulurken hata</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Kişilere ekle</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Konuşmayı başlat !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>İletinizi buraya yazın</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>ileti gönder</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Sizinle konuşmak istiyor!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Yanıtla</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Göz ardı et</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Aranıyor</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Ara</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Ayarlar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Genel</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>ayarlar menüsünden çık</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Geçmiş Ayarları</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Geçmişi tutulacak gün sayısı:</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(sınırsız geçmiş için 0 yapın)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Geçmişi Temizle</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Çeşitli Ayarlar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Kapatırken küçültülmüş olarak tut</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>Şimdi güncellemeleri denetle</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Ad</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Kayıt Ayarları</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Buraya kaydet :</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Her Zaman Kaydet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>Bildirimleri etkinleştir</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Güncellemeleri kendiliğinden denetle</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>gün</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Arama sırasında önizleme mevcut değil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Aygıt Seçimi</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Aygıt</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Çözünürlük</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Çıkış Aygıtı</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Giriş Aygıtı</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>yeni hesap ekle</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>İçe aktar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Dışa aktar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Hesap</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Ring&apos;i başlangıçta çalıştır</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Yeni Hesap</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Tüm geçmişinizi silmek istediğinizden emin misiniz?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Dizin Seç</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>Hesap içe aktarılırken bir hata oldu.</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Ara...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Yeni kişi oluştur</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Yeni Kişi</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Buraya bir ad girin...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Oluştur</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Kabul et</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation>Vazgeç</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Engelleme</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>Form</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Tamam</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Metin iletisi gönder...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Kopyala</translation>
@@ -1059,22 +1592,27 @@
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Fotoğraf çek</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>veya</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>İçe Aktar</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Kendiliğinden</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Mikrofonu kapat</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Nitelik</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Çağrılara katıl</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>İsim etiketi</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Kişiye ekle</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Geçen zaman</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Kapat</translation>
@@ -1233,67 +1817,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation>Ring hesabınız göç ettiriliyor...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Bilinmeyen</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation>Herkese açık kullanıcı adınız kaydediliyor, birkaç dakika sürebilir...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>Bir aygıt ekle</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>Kullanıcı adı uygun değil</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>Kullanıcı adı uygun</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>Kullanıcı adı geçersiz.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>Ağ hatası.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>Ring Hesabı Oluştur</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Bu aygıtı bir hesaba bağla</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>Bir aygıt nasıl eklenir</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation>Hoş Geldiniz</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,71 +1891,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>Profilinizi oluşturun</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation>Tam adınızı girin:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>Hesabınızı oluşturun</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Kullanıcı adınızı seçin</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>Arama yapılıyor...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation>Kullanıcı adınızı Ring sisteminde kaydedin. Bu işlem kullanıcı adınızı yalnızca sizin için ayıracak ve arkadaşlarınız sizi RingID&apos;niz yerine kullanıcı adınızı kullanarak arayabilecek.</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>Halka açık kullanıcı adı kaydet (deneysel)</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>Pin&apos;inizi girin</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Parolayı onayla</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Ring hesabınız oluşturuluyor...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>Önceki</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>İleri</translation>
     </message>

translations/ring_client_windows_uk.ts

diff --git a/translations/ring_client_windows_uk.ts b/translations/ring_client_windows_uk.ts
index 08dddb9..8ed1e06 100644
--- a/translations/ring_client_windows_uk.ts
+++ b/translations/ring_client_windows_uk.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>Про программу</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>Подяки</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Клієнт Ring для Microsoft Windows.
@@ -53,90 +63,115 @@
         <translation>Налаштування</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>Головні</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>Аккаунт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>Додаткове ім’я</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>Параметри</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>Ім&apos;я хоста</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Ім’я</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>Проксі</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>Номер голосової пошти</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>Автоматично відповідати на дзвінки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP включено</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>Приймати дзвінки від невідомих контактів</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>Приймати дзвінки від контактів</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>Приймати дзвінки від контактів з історії</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Налаштування аккаунту Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>Вибір рингтону</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Програти</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>Аудіо/Відео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>Аудіо кодеки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>Відео кодеки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>Додаткові</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>Реєстрація</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Час придатності регістрації (секунди):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>Мережевий інтерфейс</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>Локальний порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>Аналогічно локальним налашуванням</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>Встановити оголошену адресу та порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>Адреса</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>Використовувати STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>URL серверу</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>Використовувати TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>Оточення</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Погодження сесій SDP (резервування ICE)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>Порти для передачі аудіо по RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>Мінімально</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>Максимально</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>Порти для передачі відео по RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>Безпека</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Шифрування медіа потоку (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>Відміна</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>Шифрувати потік (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>Опублікована адреса</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>CA сертифікат</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>Сертифікат користувача</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>Приватний ключ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>Пароль від приватного ключа</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>Використовувати шифрувальники за замовчуванням</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>або введіть номер...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>Переадресація</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Знайти контакти або ввести ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>Групові чати</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>Запити контактів</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>налаштування меню</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>Поділитися вашим ring id</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>Це ваш RingID.
 Копіюйте й поширюйте його серед Ваших друзів!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>Помилка при генерації QR-коду</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>Додати контакти</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>Почати розмову!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>віпдправити повідомлення</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>Хоче поговорити з вами!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>Відповідь</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>Ігнорувати</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>Дзвінок</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>Відміна</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>Дзвінок</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>Налаштування</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>Головні</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation>Аудіо/Відео</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation>Облікові записи</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>вийти з меню налаштуваннь</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>Налаштування історії</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>Зберігати історію протягом (дні)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>(встановити у 0 для безкінечної історії)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>Очистити історію</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>Додаткові параметри</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>Згортати вікно при закриванні</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>Відео</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>Профіль</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>Ім’я</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>Записати Налаштування</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>Зберегти в :</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>Завжди робити запис</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>Перевіряти оновлення автоматично кожні</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>днів</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>Попередній перегляд не доступний від час виклику</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>Вибір пристрою</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>Пристрій</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>Роздільна здатність</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>Пристрій Виведення</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>Пристрій Введення</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>додати новий контакт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>Імпортувати</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>Експортувати</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>Аккаунт</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>Завантажувати Ring разом з системою</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>Новий аккаунт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Ви все ще бажаєте очистити історію?</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>Обрати директорію</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>При імпорті облікового запису трапилася помилка.</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>Пошук...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>Створити новий контакт...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>Новий контакт</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>Впишить тут ім’я...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>Створити</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>Прийняти</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>Заблокувати</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>Форма</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>Відміна</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>Ок</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>Відміна</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>Видалити</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>Відправити текстове повідомлення...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>Копіювати</translation>
@@ -1059,22 +1592,27 @@
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>Зняти фото</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>чи</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>Імпортувати</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>Авто</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>Відключити мікрофон</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>Якість</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>Приєднати виклики</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>Назва етикетки</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>Додати до контактів</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>Витрачено часу</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation>Конфігурація</translation>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>Відновлення виклику</translation>
@@ -1233,67 +1817,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>Невідомий</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1307,71 +1891,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>Оберіть ваше ім&apos;я користувача</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>Підтвердити пароль</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Генерація вашого облікового запису Ring...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>Наступний</translation>
     </message>

translations/ring_client_windows_zh.ts

diff --git a/translations/ring_client_windows_zh.ts b/translations/ring_client_windows_zh.ts
index 9754814..bb1c0f2 100644
--- a/translations/ring_client_windows_zh.ts
+++ b/translations/ring_client_windows_zh.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>關於</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation type="unfinished"/>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
@@ -52,90 +62,115 @@
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>通用</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>帳號</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>型</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>別名</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>參數</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>主機名稱</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>使用者名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>代理</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>語音留言號</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>來電自動應答</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP 已啟動</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>允許未知來電</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>允許通訊錄來電</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>允許歷史來電</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -146,236 +181,448 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Ring 帳號設定</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>播放</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>音訊/視訊</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>音訊編碼器</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>視訊編碼器</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>進階</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>註冊</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>網路介面</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>與本地參數相同</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>設定公開地址與連結埠：</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>地址</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>埠</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>使用STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>使用</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>最小值</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>最大值</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>安全</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>媒體串流加密(SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>加密媒體串流(SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>公開發佈地址</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>CA 認證</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>使用者認證</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>私鑰</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>私鑰保護密碼</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>使用預設加密方式</translation>
     </message>
@@ -428,12 +675,22 @@
         <translation>從</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
@@ -441,12 +698,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>或是輸入號碼...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>傳送</translation>
     </message>
@@ -454,105 +726,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>從通訊錄尋找或是輸入ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>對話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>設定選單</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>分享你的ring ID</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>這是你的RingID
 複製並且與你的朋友們分享！</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>加到聯絡人</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>傳送訊息</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>想要與你談天！</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>接通</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>撥打</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>撥打</translation>
     </message>
@@ -645,6 +959,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -652,167 +974,283 @@
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>通用</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>離開設定選單</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>歷史記錄設定</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>保留歷史紀錄(天)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>清除歷史紀錄</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>影像</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>個人檔案</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>姓名</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>儲存於:</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>自動檢查更新每</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>天</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>裝置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>解析度</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>輸出裝置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>輸入裝置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>加入新的帳號</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>載入</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>輸出</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>帳號</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>啟動時執行</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>注册</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>選擇目錄</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation type="unfinished"/>
     </message>
@@ -826,26 +1264,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>搜尋...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>建立新連絡人</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>新連絡人</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>建立</translation>
     </message>
@@ -873,17 +1336,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
@@ -895,6 +1373,21 @@
         <source>Form</source>
         <translation>從</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -920,11 +1413,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>確定</translation>
     </message>
@@ -943,16 +1446,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation type="unfinished"/>
     </message>
@@ -960,11 +1478,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>傳送文字訊息...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>複製</translation>
@@ -1058,22 +1591,27 @@
         <translation>從</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>或</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>載入</translation>
     </message>
@@ -1105,12 +1643,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1166,36 +1740,46 @@
         <translation>麥克風靜音</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>品質</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>加入通話</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>加入通訊錄 </translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>經過時間</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation type="unfinished"/>
@@ -1232,67 +1816,67 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1306,71 +1890,206 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>创建你的个人资料</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>创建你的账户</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>選擇你的使用者名稱</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>Ring 帳號產生中...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>下一步</translation>
     </message>

translations/ring_client_windows_zh_CN.ts

diff --git a/translations/ring_client_windows_zh_CN.ts b/translations/ring_client_windows_zh_CN.ts
index a9aaff8..6ae9ad5 100644
--- a/translations/ring_client_windows_zh_CN.ts
+++ b/translations/ring_client_windows_zh_CN.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>致谢</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>自由、平等、博爱 - 版本 1.0</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Ring的Microsoft Windows客户端。
@@ -53,90 +63,115 @@
         <translation>设置</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>通用</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>帐户</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>类别</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>别名</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>参数</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>主机名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>用户名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>代理</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>语音信箱号码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>自动应答</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP已启用</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>允许未知来电</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>允许通讯录来电</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>允许历史记录再次来电</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>公共用户名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation>在区块链上注册</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>名称服务器URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Ring帐户设置</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>铃声选择</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>播放</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>音频/视频</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>音频编码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>视频编码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>高级</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>注册</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>注册超时（秒）：</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>网络接口</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>本地端口：</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>与本地配置相同</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>设置公开地址与端口：</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>地址：</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>端口</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>使用STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>服务器URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>使用TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>域</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP协议握手（当ICE协议不受支持）</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>音频RTP端口范围</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>最小</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>最大</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>视频RTP端口范围</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>安全</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>流媒体加密（SRTP）</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>设备</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>添加设备</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>要在新设备上添加您的Ring帐户，您需要使用Ring导出该帐户。您会获得一个PIN，并且有5分钟时间将该PIN输入您的新设备。</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>密码（必填）</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>Ring导出</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>您的PIN：</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>PIN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation>该PIN需要在5分钟内输入您的新设备。您可以随时生成新的PIN。</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>确定</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>已屏蔽的联系人</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>加密流媒体（SRTP）</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>公开地址</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>颁发机构证书</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>用户证书</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>私钥</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>私钥密码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>使用默认加密算法</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>表单</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>已屏蔽的ID</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>从屏蔽列表中移除，并添加至通讯录</translation>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>或输入号码…</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>传输</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>查找通讯录或输入RingID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>会话</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>联系人请求</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>设置菜单</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring是自由软件，尊重用户的通讯自由与隐私。</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>共享您的RingID</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>这是您的RingID。
 复制并发送给您的朋友！</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>双击复制</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>创建二维码时产生错误</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>加入通讯录</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>开始会话！</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>在此输入您的消息</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>发送消息</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation>BestId</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>想要与您通信！</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>应答</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>正在通话</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>通话</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>设置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>通用</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>退出设置菜单</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>历史记录设置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>历史记录保存天数</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>（设置为0则无限制）</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>清除历史记录</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>其他设置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>退出时保持窗口最小化</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>立即检查更新</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>视频</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>帐户资料</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>姓名</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>录音设置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>保存至：</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>总是录制</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>启用通知</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>自动检查更新：每</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>天</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>通话时无法预览</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>设备选择</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>设备</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>分辨率</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>输出设备</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>输入设备</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>添加新帐户</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>倒入</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>导出</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>帐户</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>系统启动时运行Ring</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>新帐户</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>确定删除您的所有历史记录吗？</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>选择文件夹</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>导入帐户时发生错误。</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>搜索…</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>创建新通讯录</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>新通讯录</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>在此处输入名称…</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>创建</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation>bestIdLabel</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>接听</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation>丢弃</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>屏蔽</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>表单</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>确定</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation>删除并屏蔽</translation>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>发送文字消息…</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>复制</translation>
@@ -1059,22 +1592,27 @@
         <translation>表单</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>拍照</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>或</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation>导入照片</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>倒入</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>自动</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>将麦克风静音</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>质量</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>加入通话</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>名称标签</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>加入通讯录</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>用时</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>挂断</translation>
@@ -1233,67 +1817,67 @@
         <translation>您的Ring帐户可以被更新。\n请输入您的密码。</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation>正在迁移您的Ring帐户…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation>正在注册您的公共用户名，可能需要几分钟…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>添加设备</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>用户名不可用。</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>用户名可用。</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>用户名非法。</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>网络错误。</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>创建Ring帐户</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>将此设备与一个帐户进行连接</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>如何添加设备</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation>欢迎来到</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1316,71 +1900,206 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;这样您就会获得一个用来完成添加帐户的 PIN，该 PIN 在 &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 分钟&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;内有效。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>创建您的帐户资料</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation>输入您的全名：</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>创建Ring帐户</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>设置您的用户名</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>正在搜索…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation>在Ring上注册您的用户名。该用户名将由您独占。您的联系人将能够使用该用户名联系您，不必使用您的RingID。</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>注册公共用户名（试验性）</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>输入您的PIN</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>确认密码</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>正在生成您的Ring帐户…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>上一步</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>下一步</translation>
     </message>

translations/ring_client_windows_zh_TW.ts

diff --git a/translations/ring_client_windows_zh_TW.ts b/translations/ring_client_windows_zh_TW.ts
index f656043..00b672d 100644
--- a/translations/ring_client_windows_zh_TW.ts
+++ b/translations/ring_client_windows_zh_TW.ts
@@ -3,22 +3,32 @@
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
-        <location filename="../aboutdialog.ui" line="462"/>
+        <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
         <translation>關於</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="475"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>about button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="478"/>
+        <source>credits button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
         <translation>榮譽</translation>
     </message>
     <message utf8="true">
-        <location filename="../aboutdialog.ui" line="541"/>
+        <location filename="../aboutdialog.ui" line="547"/>
         <source>Liberté, Égalité, Fraternité - Version 1.0</source>
         <translation>Liberté, Égalité, Fraternité - 1.0 版</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="557"/>
+        <location filename="../aboutdialog.ui" line="563"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Ring 的 Microsoft Windows 客戶端。
@@ -53,90 +63,115 @@
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="63"/>
+        <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="137"/>
+        <location filename="../accountdetails.ui" line="143"/>
         <source>Account</source>
         <translation>帳號</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="197"/>
+        <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="163"/>
-        <source>Alias</source>
-        <translation>別名</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="241"/>
+        <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
         <translation>參數</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="271"/>
+        <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
         <translation>主機名稱</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="405"/>
-        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.ui" line="426"/>
+        <location filename="../accountdetails.ui" line="1572"/>
         <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>使用者名稱</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="445"/>
-        <location filename="../accountdetails.ui" line="1501"/>
+        <location filename="../accountdetails.ui" line="469"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="488"/>
+        <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
         <translation>代理服務器</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="528"/>
+        <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
         <translation>語音郵件號碼</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="562"/>
+        <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
         <translation>自動回答呼叫</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="580"/>
+        <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
         <translation>UPnP 已啟用</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="638"/>
+        <location filename="../accountdetails.ui" line="680"/>
         <source>Allow Call From Unknown</source>
         <translation>允許從未知對象的通話</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="665"/>
+        <location filename="../accountdetails.ui" line="713"/>
         <source>Allow Call From Contact</source>
         <translation>允許從聯絡人來的通話</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="653"/>
+        <location filename="../accountdetails.ui" line="698"/>
         <source>Allow Call From History</source>
         <translation>允許從歷史紀錄而來的通話</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="311"/>
+        <location filename="../accountdetails.ui" line="69"/>
+        <source>General account info configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="169"/>
+        <source>Displayed name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="191"/>
+        <source>Displayed alias input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="302"/>
+        <source>Hostname URL for DHT bootstrap or SIP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
         <translation>公開的使用者名稱</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Ring public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="369"/>
+        <source>Register username on blockchain button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="372"/>
         <location filename="../accountdetails.cpp" line="106"/>
         <location filename="../accountdetails.cpp" line="359"/>
         <location filename="../accountdetails.cpp" line="376"/>
@@ -147,236 +182,448 @@
         <translation>在區塊鏈上註冊</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="371"/>
+        <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
         <translation>名稱服務 URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="611"/>
+        <location filename="../accountdetails.ui" line="411"/>
+        <source>Nameservice URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="448"/>
+        <source>SIP username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="491"/>
+        <source>SIP password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="537"/>
+        <source>SIP proxy URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>SIP voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="592"/>
+        <source>Autoanswer call checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="613"/>
+        <source>UPnP enabled checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="650"/>
         <source>Ring Account Settings</source>
         <translation>Ring 帳號設定</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="701"/>
+        <location filename="../accountdetails.ui" line="674"/>
+        <source>Allow call from unknown checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="692"/>
+        <source>Allow Call From History checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="710"/>
+        <source>Allow Call From Contact checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="749"/>
         <source>Ringtone Selection</source>
         <translation>鈴聲選取</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.ui" line="773"/>
+        <source>Play ringtone button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="776"/>
         <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>播放</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="785"/>
+        <location filename="../accountdetails.ui" line="789"/>
+        <source>ringtone file selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="839"/>
         <source>Audio/Video</source>
         <translation>音訊／視訊</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1001"/>
+        <location filename="../accountdetails.ui" line="842"/>
+        <source>Audio/video codecs preferences configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1058"/>
         <source>Audio codecs</source>
         <translation>音訊編解碼器</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1031"/>
+        <location filename="../accountdetails.ui" line="1088"/>
         <source>Video codecs</source>
         <translation>視訊編解碼器</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1048"/>
+        <location filename="../accountdetails.ui" line="1105"/>
         <source>Advanced</source>
         <translation>進階</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1094"/>
+        <location filename="../accountdetails.ui" line="1108"/>
+        <source>Account advanced configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1154"/>
         <source>Registration</source>
         <translation>註冊</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1114"/>
+        <location filename="../accountdetails.ui" line="1174"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>註冊過期逾時（秒）：</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1152"/>
+        <location filename="../accountdetails.ui" line="1190"/>
+        <source>Registration timeout selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1215"/>
         <source>Network Interface</source>
         <translation>網路介面</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1173"/>
+        <location filename="../accountdetails.ui" line="1236"/>
         <source>Local Port:</source>
         <translation>本機連接埠：</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1277"/>
+        <location filename="../accountdetails.ui" line="1254"/>
+        <source>local port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1340"/>
+        <source>same as local radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1346"/>
         <source>Same as local parameters</source>
         <translation>與本機參數相同</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1298"/>
+        <location filename="../accountdetails.ui" line="1364"/>
+        <source>personalise address and ports radio button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1370"/>
         <source>Set published address and port:</source>
         <translation>設定公開位置與連接埠：</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1324"/>
+        <location filename="../accountdetails.ui" line="1396"/>
         <source>Address</source>
         <translation>地址</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1355"/>
+        <location filename="../accountdetails.ui" line="1415"/>
+        <source>ip address text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1430"/>
         <source>Port</source>
         <translation>連接埠</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1409"/>
+        <location filename="../accountdetails.ui" line="1449"/>
+        <source>port selector spinbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1484"/>
+        <source>use STUN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1490"/>
         <source>Use STUN</source>
         <translation>使用 STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1425"/>
-        <location filename="../accountdetails.ui" line="1466"/>
+        <location filename="../accountdetails.ui" line="1506"/>
+        <location filename="../accountdetails.ui" line="1553"/>
         <source>Server URL</source>
         <translation>伺服器網址</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1450"/>
+        <location filename="../accountdetails.ui" line="1528"/>
+        <source>use TURN checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1534"/>
         <source>Use TURN</source>
         <translation>使用 TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1517"/>
+        <location filename="../accountdetails.ui" line="1550"/>
+        <source>TURN server URL input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1569"/>
+        <source>TURN server username input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1588"/>
+        <source>TURN server password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1610"/>
+        <source>TURN server Realm input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1613"/>
         <source>Realm</source>
         <translation>領域</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1566"/>
+        <location filename="../accountdetails.ui" line="1662"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP 工作階段協商（ICE 退回）</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1594"/>
+        <location filename="../accountdetails.ui" line="1690"/>
         <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="1636"/>
+        <location filename="../accountdetails.ui" line="1732"/>
         <source>Audio RTP Port Range</source>
         <translation>音訊 RTP 連接埠範圍</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1666"/>
-        <location filename="../accountdetails.ui" line="1800"/>
+        <location filename="../accountdetails.ui" line="1762"/>
+        <location filename="../accountdetails.ui" line="1902"/>
         <source>Min</source>
         <translation>最小值</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1697"/>
-        <location filename="../accountdetails.ui" line="1831"/>
+        <location filename="../accountdetails.ui" line="1778"/>
+        <location filename="../accountdetails.ui" line="1918"/>
+        <source>Lower boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1796"/>
+        <location filename="../accountdetails.ui" line="1936"/>
         <source>Max</source>
         <translation>最大值</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1770"/>
+        <location filename="../accountdetails.ui" line="1812"/>
+        <location filename="../accountdetails.ui" line="1952"/>
+        <source>higher boundary for audio RTP port range selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1872"/>
         <source>Video RTP Port Range</source>
         <translation>視訊 RTP 連接埠範圍</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1896"/>
+        <location filename="../accountdetails.ui" line="2004"/>
         <source>Security</source>
         <translation>安全性</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2115"/>
+        <location filename="../accountdetails.ui" line="2007"/>
+        <source>Account security configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2094"/>
+        <source>Certificate authaurity certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2131"/>
+        <source>User certificate selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2189"/>
+        <source>private key password input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2211"/>
+        <source>User private key selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2235"/>
+        <source>Encrypt media stream (SRTP) checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2238"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>媒體串流加密（SRTP）</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2180"/>
+        <location filename="../accountdetails.ui" line="2250"/>
+        <source>use default ciphers checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2306"/>
         <source>Devices</source>
         <translation>裝置</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2224"/>
+        <location filename="../accountdetails.ui" line="2309"/>
+        <source>Account devices management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2353"/>
+        <source>Add device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2356"/>
         <source>Add device</source>
         <translation>新增裝置</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2251"/>
+        <location filename="../accountdetails.ui" line="2383"/>
         <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
         <translation>要新增新裝置到您的 Ring 帳號，您要先在 Ring 上匯出您的帳號。這將會生成 PIN 碼，必須在生成後的 5 分鐘內輸入到您的新裝置上。</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2267"/>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2402"/>
         <source>Password (required)</source>
         <translation>密碼（必要）</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2295"/>
+        <location filename="../accountdetails.ui" line="2430"/>
+        <source>Cancel account export for linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2433"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2321"/>
+        <location filename="../accountdetails.ui" line="2459"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2462"/>
         <source>Export on the Ring</source>
         <translation>在 Ring 上匯出</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2373"/>
+        <location filename="../accountdetails.ui" line="2514"/>
         <source>Your generated pin:</source>
         <translation>您的已生成 PIN 碼：</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2386"/>
+        <location filename="../accountdetails.ui" line="2527"/>
+        <source>Generated PIN for linking</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2530"/>
         <source>PIN</source>
         <translation>PIN 碼</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2396"/>
+        <location filename="../accountdetails.ui" line="2540"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
         <translation>這個 PIN 碼應該要在 5 分鐘內於您的新裝置上輸入。您可以在任何時候生成新的。</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2415"/>
+        <location filename="../accountdetails.ui" line="2559"/>
+        <source>Accept PIN generation and quit button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2562"/>
         <source>OK</source>
         <translation>確定</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2440"/>
+        <location filename="../accountdetails.ui" line="2587"/>
         <source>Banned Contacts</source>
         <translation>黑名單聯絡人</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2112"/>
-        <source>Encrypt media stream (SRTP)</source>
-        <translation>加密媒體串流 (SRTP)</translation>
+        <location filename="../accountdetails.ui" line="2590"/>
+        <source>Account banned contacts management tab</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1247"/>
+        <location filename="../accountdetails.ui" line="1313"/>
         <source>Published Address</source>
         <translation>公開位置</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1961"/>
+        <location filename="../accountdetails.ui" line="2072"/>
         <source>CA certificate</source>
         <translation>CA 證書</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1998"/>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>User certificate</source>
         <translation>使用者證書</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2032"/>
+        <location filename="../accountdetails.ui" line="2149"/>
         <source>Private key</source>
         <translation>私密金鑰</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2047"/>
+        <location filename="../accountdetails.ui" line="2164"/>
         <source>Private key password</source>
         <translation>私密金鑰密碼</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2127"/>
+        <location filename="../accountdetails.ui" line="2253"/>
         <source>Use default ciphers</source>
         <translation>使用預設加密法</translation>
     </message>
@@ -429,12 +676,22 @@
         <translation>表單</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <location filename="../bannedcontactswidget.ui" line="41"/>
+        <source>Banned contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
         <translation>黑名單 ID</translation>
     </message>
     <message>
-        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <location filename="../bannedcontactswidget.ui" line="101"/>
+        <source>Deban contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
         <translation>解除封鎖聯絡人，並加入到聯絡人清單</translation>
     </message>
@@ -442,12 +699,27 @@
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="65"/>
+        <location filename="../callutilsdialog.ui" line="53"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="68"/>
+        <source>contact transfer number text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="71"/>
         <source>or type number...</source>
         <translation>或輸入號碼...</translation>
     </message>
     <message>
-        <location filename="../callutilsdialog.ui" line="104"/>
+        <location filename="../callutilsdialog.ui" line="110"/>
+        <source>Transfer call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="113"/>
         <source>Transfer</source>
         <translation>轉送</translation>
     </message>
@@ -455,105 +727,147 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="213"/>
+        <location filename="../callwidget.ui" line="216"/>
         <source>Search contacts or enter ring ID</source>
         <translation>搜尋聯絡人或輸入 ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="324"/>
+        <location filename="../callwidget.ui" line="333"/>
         <source>Conversations</source>
         <translation>對話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="375"/>
+        <location filename="../callwidget.ui" line="384"/>
         <source>Contact requests</source>
         <translation>聯絡人請求</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="548"/>
-        <source>settings menu</source>
-        <translation>設定選單</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="633"/>
+        <location filename="../callwidget.ui" line="642"/>
         <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
         <translation>Ring 是一套通用通訊的自由軟體，其尊重使用者的自由與隱私。</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="782"/>
-        <source>Share your ring id</source>
-        <translation>分享你的 ring id</translation>
+        <location filename="../callwidget.ui" line="207"/>
+        <source>Search contact text input</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="671"/>
+        <location filename="../callwidget.ui" line="248"/>
+        <source>search button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="557"/>
+        <source>Configuration menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="680"/>
         <source>This is your RingID.
 Copy and share it with your friends!</source>
         <translation>這是你的 RingID。
 複製並與你的朋友分享！</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="888"/>
+        <location filename="../callwidget.ui" line="791"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="842"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="900"/>
         <source>Double-click to copy</source>
         <translation>雙擊以複製</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="923"/>
+        <location filename="../callwidget.ui" line="935"/>
         <source>Error while generating QR Code</source>
         <translation>產生 QR Code 時發生錯誤</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1193"/>
+        <location filename="../callwidget.ui" line="979"/>
+        <location filename="../callwidget.ui" line="1069"/>
+        <location filename="../callwidget.ui" line="1840"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1189"/>
+        <source>Peer contact method selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1208"/>
         <location filename="../callwidget.cpp" line="327"/>
         <source>Add to contacts</source>
         <translation>加到聯絡人</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1222"/>
+        <location filename="../callwidget.ui" line="1237"/>
         <source>Start the conversation !</source>
         <translation>開始通話！</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1299"/>
+        <location filename="../callwidget.ui" line="1314"/>
         <source>Type your message here</source>
         <translation>在這裡輸入您的訊息</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1318"/>
+        <location filename="../callwidget.ui" line="1333"/>
         <source>send message</source>
         <translation>傳送訊息</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1444"/>
+        <location filename="../callwidget.ui" line="1459"/>
         <source>BestId</source>
         <translation>BestId</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1454"/>
+        <location filename="../callwidget.ui" line="1469"/>
         <source>Wants to talk to you!</source>
         <translation>想要與您說說話！</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1549"/>
+        <location filename="../callwidget.ui" line="1498"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1570"/>
         <source>Answer</source>
         <translation>回覆</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1581"/>
+        <location filename="../callwidget.ui" line="1602"/>
         <source>Ignore</source>
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1652"/>
+        <location filename="../callwidget.ui" line="1673"/>
         <source>Calling</source>
         <translation>正在通話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1725"/>
+        <location filename="../callwidget.ui" line="1726"/>
+        <source>Cancel outgoing call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1749"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1434"/>
+        <location filename="../callwidget.ui" line="1449"/>
         <source>Call</source>
         <translation>呼叫</translation>
     </message>
@@ -646,6 +960,14 @@
     </message>
 </context>
 <context>
+    <name>ComBar</name>
+    <message>
+        <location filename="../combar.ui" line="72"/>
+        <source>Call button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ConfigurationWidget</name>
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
@@ -653,167 +975,283 @@
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="100"/>
+        <location filename="../configurationwidget.ui" line="97"/>
+        <source>General configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="103"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="171"/>
+        <location filename="../configurationwidget.ui" line="119"/>
+        <source>Audio / Video configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="122"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="138"/>
+        <source>Accounts configuration tab</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="141"/>
+        <source>Accounts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="180"/>
         <source>quit settings menu</source>
         <translation>退出設定選單</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="331"/>
+        <location filename="../configurationwidget.ui" line="346"/>
         <source>History Settings</source>
         <translation>歷史記錄設定</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="372"/>
+        <location filename="../configurationwidget.ui" line="387"/>
         <source>Keep History for (days)</source>
         <translation>保持歷史記錄數日</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="415"/>
+        <location filename="../configurationwidget.ui" line="433"/>
         <source>(Set to 0 for unlimited history)</source>
         <translation>（設定為 0 以保留無限制的歷史紀錄）</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="469"/>
+        <location filename="../configurationwidget.ui" line="490"/>
         <source>Clear History</source>
         <translation>清除歷史記錄</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="615"/>
+        <location filename="../configurationwidget.ui" line="642"/>
         <source>Misc. Settings</source>
         <translation>其他設定</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="637"/>
+        <location filename="../configurationwidget.ui" line="667"/>
         <source>Keep minimized on close</source>
         <translation>在關閉時保持最小化</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="775"/>
+        <location filename="../configurationwidget.ui" line="820"/>
         <source>Check for updates now</source>
         <translation>現在檢查更新</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="116"/>
-        <source>Video</source>
-        <translation>視訊</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="249"/>
+        <location filename="../configurationwidget.ui" line="258"/>
         <source>Profile</source>
         <translation>介紹</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="299"/>
+        <location filename="../configurationwidget.ui" line="288"/>
+        <source>Avatar (click to change)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="311"/>
+        <source>Display name text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="314"/>
         <source>Name</source>
         <translation>名稱</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="506"/>
+        <location filename="../configurationwidget.ui" line="400"/>
+        <source>Number of days of history kept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="484"/>
+        <source>clear history button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="527"/>
         <source>Record Settings</source>
         <translation>記錄設定</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="539"/>
+        <location filename="../configurationwidget.ui" line="560"/>
         <source>Save in :</source>
         <translation>儲存在：</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="582"/>
+        <location filename="../configurationwidget.ui" line="573"/>
+        <source>Call records path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="603"/>
+        <source>Always record calls checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="609"/>
         <source>Always Record</source>
         <translation>總是記錄</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="652"/>
+        <location filename="../configurationwidget.ui" line="661"/>
+        <source>keep minimized on close checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="679"/>
+        <source>enable notifications checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="685"/>
         <source>Enable notifications</source>
         <translation>啟用通知</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="699"/>
+        <location filename="../configurationwidget.ui" line="703"/>
+        <source>Launch ring on startup checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="732"/>
+        <source>Autamatic update checks checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="738"/>
         <source>Check for update automatically every</source>
         <translation>自動檢查更新每</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
+        <location filename="../configurationwidget.ui" line="757"/>
+        <source>Interval between update checks in days selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="778"/>
         <source>days</source>
         <translation>天</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="888"/>
+        <location filename="../configurationwidget.ui" line="817"/>
+        <source>Check for updates now button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="933"/>
         <source>Preview unavailable during call</source>
         <translation>在通話時預覽不可用</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="942"/>
+        <location filename="../configurationwidget.ui" line="987"/>
         <source>Device Selection</source>
         <translation>裝置選擇</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1000"/>
+        <location filename="../configurationwidget.ui" line="1042"/>
+        <location filename="../configurationwidget.ui" line="1061"/>
+        <source>Video device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1048"/>
         <source>Device</source>
         <translation>裝置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1031"/>
+        <location filename="../configurationwidget.ui" line="1082"/>
         <source>Resolution</source>
         <translation>解析度</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1068"/>
+        <location filename="../configurationwidget.ui" line="1095"/>
+        <source>Video device resolution selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1122"/>
         <source>Output Device</source>
         <translation>輸出裝置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1083"/>
+        <location filename="../configurationwidget.ui" line="1129"/>
+        <source>Audio output device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1141"/>
         <source>Input Device</source>
         <translation>輸入裝置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1180"/>
+        <location filename="../configurationwidget.ui" line="1148"/>
+        <source>Audio input device selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1226"/>
+        <source>New account type selector</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1245"/>
         <source>add new account</source>
         <translation>加入新帳號</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1242"/>
+        <location filename="../configurationwidget.ui" line="1283"/>
+        <source>Delete account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1310"/>
+        <source>Import account archive button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1313"/>
         <source>Import</source>
         <translation>匯入</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1249"/>
+        <location filename="../configurationwidget.ui" line="1320"/>
+        <source>Export account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1323"/>
         <source>Export</source>
         <translation>匯出</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="132"/>
-        <source>Account</source>
-        <translation>帳號</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="676"/>
+        <location filename="../configurationwidget.ui" line="712"/>
         <source>Launch Ring on Startup</source>
         <translation>開機時啟動 Ring</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="310"/>
+        <location filename="../configurationwidget.cpp" line="322"/>
         <source>New Account</source>
         <translation>新增帳號</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="330"/>
+        <location filename="../configurationwidget.cpp" line="342"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>您確定您要清除您所有的歷史？</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="379"/>
+        <location filename="../configurationwidget.cpp" line="391"/>
         <source>Choose Directory</source>
         <translation>選擇資料夾</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="409"/>
+        <location filename="../configurationwidget.cpp" line="421"/>
         <source>An error occured while importing account.</source>
         <translation>當匯入帳號時遇到錯誤。</translation>
     </message>
@@ -827,26 +1265,51 @@
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
+        <source>search existing contact text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="46"/>
         <source>Search...</source>
         <translation>搜尋...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
+        <source>existing contacts list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="63"/>
+        <source>Create new contact button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="66"/>
         <source>Create new contact</source>
         <translation>建立新聯絡人</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="75"/>
+        <location filename="../contactpicker.ui" line="85"/>
         <source>New Contact</source>
         <translation>新聯絡人</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="98"/>
+        <location filename="../contactpicker.ui" line="108"/>
+        <source>New contact name text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="111"/>
         <source>Enter a name here...</source>
         <translation>在這裡輸入名稱...</translation>
     </message>
     <message>
-        <location filename="../contactpicker.ui" line="128"/>
+        <location filename="../contactpicker.ui" line="141"/>
+        <source>Validate contact creation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="144"/>
         <source>Create</source>
         <translation>建立</translation>
     </message>
@@ -874,17 +1337,32 @@
         <translation>bestIdLabel</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="129"/>
+        <location filename="../contactrequestwidget.ui" line="125"/>
+        <source>Accept contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="132"/>
         <source>Accept</source>
         <translation>接聽</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="152"/>
+        <location filename="../contactrequestwidget.ui" line="151"/>
+        <source>Mute contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="158"/>
         <source>Discard</source>
         <translation>丟棄</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="175"/>
+        <location filename="../contactrequestwidget.ui" line="177"/>
+        <source>Ban contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="184"/>
         <source>Block</source>
         <translation>阻擋</translation>
     </message>
@@ -896,6 +1374,21 @@
         <source>Form</source>
         <translation>表單</translation>
     </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="97"/>
+        <source>Account avatar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="128"/>
+        <source>Account status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="141"/>
+        <source>account selection combobox</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DeleteAccountDialog</name>
@@ -921,11 +1414,21 @@
     </message>
     <message>
         <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="141"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <location filename="../deleteaccountdialog.ui" line="167"/>
+        <source>Validate contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="170"/>
         <source>Ok</source>
         <translation>確定</translation>
     </message>
@@ -944,16 +1447,31 @@
     </message>
     <message>
         <location filename="../deletecontactdialog.ui" line="123"/>
+        <source>Cancel contact deletion button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="126"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="136"/>
+        <location filename="../deletecontactdialog.ui" line="139"/>
+        <source>Delete contact validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="142"/>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
-        <location filename="../deletecontactdialog.ui" line="149"/>
+        <location filename="../deletecontactdialog.ui" line="155"/>
+        <source>Delete and ban validation button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deletecontactdialog.ui" line="158"/>
         <source>Delete and ban</source>
         <translation>刪除並加入黑名單</translation>
     </message>
@@ -961,11 +1479,26 @@
 <context>
     <name>InstantMessagingWidget</name>
     <message>
-        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <location filename="../instantmessagingwidget.ui" line="38"/>
+        <source>Message list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="74"/>
+        <source>Message input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="77"/>
         <source>Send text message...</source>
         <translation>傳送文字訊息...</translation>
     </message>
     <message>
+        <location filename="../instantmessagingwidget.ui" line="99"/>
+        <source>Send message button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../instantmessagingwidget.cpp" line="44"/>
         <source>Copy</source>
         <translation>複製</translation>
@@ -1059,22 +1592,27 @@
         <translation>表單</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="48"/>
+        <location filename="../photoboothwidget.ui" line="20"/>
+        <source>Photobooth display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
         <translation>照相</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="68"/>
+        <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
         <translation>或</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="81"/>
+        <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
         <translation>匯入圖片</translation>
     </message>
     <message>
-        <location filename="../photoboothwidget.ui" line="84"/>
+        <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
         <translation>匯入</translation>
     </message>
@@ -1106,12 +1644,48 @@
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="100"/>
+        <location filename="../qualitydialog.ui" line="64"/>
+        <source>Quality slider</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="103"/>
+        <source>Automatic quality checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qualitydialog.ui" line="106"/>
         <source>Auto</source>
         <translation>自動</translation>
     </message>
 </context>
 <context>
+    <name>QuickActContactRequestWidget</name>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="114"/>
+        <source>Validate Contact Request Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="139"/>
+        <source>Mute contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../quickactcontactrequestwidget.ui" line="161"/>
+        <source>Ban contact request button</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>RingButton</name>
+    <message>
+        <location filename="../ringbutton.ui" line="140"/>
+        <source>Select folder</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SendContactRequestWidget</name>
     <message>
         <location filename="../sendcontactrequestwidget.ui" line="14"/>
@@ -1167,36 +1741,46 @@
         <translation>麥克風靜音</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="367"/>
+        <location filename="../videooverlay.ui" line="338"/>
+        <source>Record call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="370"/>
         <source>Quality</source>
         <translation>品質</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="399"/>
+        <location filename="../videooverlay.ui" line="402"/>
         <source>Join Calls</source>
         <translation>加入通話</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="476"/>
         <source>Name label</source>
         <translation>名稱標籤</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="498"/>
         <source>Add to contact</source>
         <translation>加到聯絡人</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="568"/>
         <source>Time elapsed</source>
         <translation>時間流逝</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="571"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
+        <location filename="../videooverlay.ui" line="584"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
         <translation>掛斷</translation>
@@ -1233,67 +1817,67 @@
         <translation>您的帳號需要遷移。輸入您的密碼。</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="107"/>
+        <location filename="../wizarddialog.cpp" line="127"/>
         <source>Migrating your Ring account...</source>
         <translation>正在遷移您的 Ring 帳號...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="127"/>
+        <location filename="../wizarddialog.cpp" line="148"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="161"/>
+        <location filename="../wizarddialog.cpp" line="183"/>
         <source>Registering your public username, it may take a few minutes...</source>
         <translation>正在註冊您的公開使用者名稱，這可能會耗費數分鐘...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="221"/>
+        <location filename="../wizarddialog.cpp" line="243"/>
         <source>Add a device</source>
         <translation>新增裝置</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="326"/>
+        <location filename="../wizarddialog.cpp" line="348"/>
         <source>Username not available.</source>
         <translation>使用者名稱不可用</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="329"/>
+        <location filename="../wizarddialog.cpp" line="351"/>
         <source>Username is available.</source>
         <translation>使用者名稱可用。</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="332"/>
+        <location filename="../wizarddialog.cpp" line="354"/>
         <source>Username is invalid.</source>
         <translation>使用者名稱無效。</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="335"/>
+        <location filename="../wizarddialog.cpp" line="357"/>
         <source>Network error.</source>
         <translation>網路錯誤。</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="127"/>
+        <location filename="../wizarddialog.ui" line="151"/>
         <source>Create Ring account</source>
         <translation>建立 Ring 帳號</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="140"/>
+        <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>連結這個裝置到一個帳號</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="172"/>
+        <location filename="../wizarddialog.ui" line="205"/>
         <source>How to add a device</source>
         <translation>如何新增裝置</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="69"/>
+        <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
         <translation>歡迎來到</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="179"/>
+        <location filename="../wizarddialog.ui" line="212"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1316,71 +1900,206 @@
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;您將會得到必要的 PIN 碼以完成此表單。PIN 碼僅在 &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 分鐘&lt;/span&gt;內有效&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="207"/>
+        <location filename="../wizarddialog.ui" line="240"/>
         <source>Create your profile</source>
         <translation>建立您的檔案</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="312"/>
+        <location filename="../wizarddialog.ui" line="354"/>
         <source>Enter your full name:</source>
         <translation>輸入您的完整名稱：</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="368"/>
-        <location filename="../wizarddialog.cpp" line="225"/>
+        <location filename="../wizarddialog.ui" line="419"/>
+        <location filename="../wizarddialog.cpp" line="247"/>
         <source>Create your account</source>
         <translation>建立您的帳號</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="441"/>
+        <location filename="../wizarddialog.ui" line="517"/>
         <source>Choose your username</source>
         <translation>選擇您的使用者名稱</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="457"/>
-        <location filename="../wizarddialog.cpp" line="298"/>
+        <location filename="../wizarddialog.ui" line="536"/>
+        <location filename="../wizarddialog.cpp" line="320"/>
         <source>Searching...</source>
         <translation>正在搜尋...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="466"/>
+        <location filename="../wizarddialog.ui" line="460"/>
         <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
         <translation>在 Ring 上註冊您的使用者名稱。這將會保留使用者名稱，只有您可以使用它。您的朋友將可以使用您的使用者名稱來與您通話，而不用使用您的 RingID。</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Ring account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Ring account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="272"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="299"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="378"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="384"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="463"/>
+        <source>Public username checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="466"/>
+        <source>Checkbox selecting if the user wants a public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="469"/>
         <source>Register public username (experimental)</source>
         <translation>註冊公開的使用者名稱（實驗性）</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="496"/>
+        <location filename="../wizarddialog.ui" line="511"/>
+        <source>Public username edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="533"/>
+        <source>Public username validation status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="545"/>
+        <source>Disable password checkbox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="554"/>
+        <source> I do not want to set a password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="578"/>
+        <source>PIN edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="584"/>
+        <source>Device linking PIN text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="587"/>
         <source>Enter your pin</source>
         <translation>輸入您的 PIN 碼</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="526"/>
+        <location filename="../wizarddialog.ui" line="614"/>
+        <source>Password text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="620"/>
+        <source>Password text entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="626"/>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="556"/>
+        <location filename="../wizarddialog.ui" line="653"/>
+        <location filename="../wizarddialog.ui" line="659"/>
+        <source>Password confirmation text input</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="665"/>
         <source>Confirm password</source>
         <translation>確認密碼</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="624"/>
-        <location filename="../wizarddialog.cpp" line="109"/>
+        <location filename="../wizarddialog.ui" line="733"/>
+        <location filename="../wizarddialog.cpp" line="129"/>
         <source>Generating your Ring account...</source>
         <translation>正在生成您的 Ring 帳號...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="660"/>
+        <location filename="../wizarddialog.ui" line="769"/>
+        <source>Previous page button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="775"/>
+        <source>push button to access previous page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="778"/>
         <source>Previous</source>
         <translation>先前</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="692"/>
-        <location filename="../wizarddialog.ui" line="695"/>
+        <location filename="../wizarddialog.ui" line="810"/>
+        <source>Next page Button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="816"/>
+        <source>Push button to access next page of wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="819"/>
         <source>Next</source>
         <translation>下一個</translation>
     </message>