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>